Merge tag 'rel/1.9.9' into 1.9.x and bump versions
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/05d69720 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/05d69720 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/05d69720 Branch: refs/heads/master Commit: 05d69720d40699278ef2f29c25d5c1388c8a6aca Parents: ceb90ef d556d2c Author: Stefan Bodewig <[email protected]> Authored: Mon Feb 6 15:12:28 2017 +0100 Committer: Stefan Bodewig <[email protected]> Committed: Mon Feb 6 15:17:01 2017 +0100 ---------------------------------------------------------------------- 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-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 ++++++------ 29 files changed, 83 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/WHATSNEW ---------------------------------------------------------------------- diff --cc WHATSNEW index 664a0e9,664a0e9..781ed01 --- a/WHATSNEW +++ b/WHATSNEW @@@ -1,3 -1,3 +1,6 @@@ ++Changes from Ant 1.9.9 TO Ant 1.9.10 ++==================================== ++ Changes from Ant 1.9.8 TO Ant 1.9.9 =================================== http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/build.xml ---------------------------------------------------------------------- diff --cc build.xml index e5fed9b,bc01c78..d20cdd3 --- a/build.xml +++ b/build.xml @@@ -34,10 -34,10 +34,10 @@@ <property name="name" value="ant"/> <!-- this is the groupId of ant in the Maven repository --> <property name="groupid" value="org/apache/ant"/> - <property name="project.version" value="1.9.9alpha"/> - <property name="project.version" value="1.9.9"/> ++ <property name="project.version" value="1.9.10alpha"/> <!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms --> - <property name="pom.version" value="1.9.9-SNAPSHOT"/> - <property name="pom.version" value="1.9.9"/> -- <property name="manifest-version" value="1.9.9"/> ++ <property name="pom.version" value="1.9.10-SNAPSHOT"/> ++ <property name="manifest-version" value="1.9.10"/> <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/05d69720/manual/cover.html ---------------------------------------------------------------------- diff --cc manual/cover.html index 1cebc33,1cebc33..15ae811 --- 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.9 User Manual</title> ++<title>Apache Ant 1.9.10 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.9 Manual</h1> -- <p align="left">This is the manual for version 1.9.9 of ++ <h1>Apache Ant™ 1.9.10 Manual</h1> ++ <p align="left">This is the manual for version 1.9.10 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 http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/manual/credits.html ---------------------------------------------------------------------- diff --cc manual/credits.html index a4bbfcb,a4bbfcb..85e92b6 --- a/manual/credits.html +++ b/manual/credits.html @@@ -62,7 -62,7 +62,7 @@@ </ul> <center> --<p>Version: 1.9.9</p> ++<p>Version: 1.9.10</p> </center> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/release/ivy.xml ---------------------------------------------------------------------- diff --cc release/ivy.xml index f617344,f617344..fe9cfd8 --- a/release/ivy.xml +++ b/release/ivy.xml @@@ -20,7 -20,7 +20,7 @@@ xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd";> <info organisation="org/apache" -- module="ant" revision="1.9.9"/> ++ module="ant" revision="1.9.10"/> <publications xmlns:e="urn:ant.apache.org:ivy-extras"> <artifact name="ant-parent" type="pom" ext="pom"/> <artifact name="ant-parent" type="pom.asc" ext="pom.asc"/> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-antlr/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-antlr/pom.xml index efb3aec,59d4af3..7eb2863 --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + ANTLR</name> <description>antlr specific task. The implementation forks a java process, therefore the antlr jar file is only needed at runtime</description> @@@ -41,7 -41,7 +41,7 @@@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <optional>true</optional> <scope>compile</scope> </dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-apache-bcel/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-bcel/pom.xml index 8fab5bb,7607edd..c526eab --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + BCEL</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-apache-bsf/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-bsf/pom.xml index 2584ad0,9189098..0975ce4 --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + BSF</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-apache-log4j/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-log4j/pom.xml index 0e56f80,158afc6..a0397dc --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + Log4J</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-apache-oro/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-oro/pom.xml index 7194fff,4387423..cb1a487 --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + Apache Oro</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-apache-regexp/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-regexp/pom.xml index fb473ec,8b22a0b..117d588 --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + Apache Regexp</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-apache-resolver/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-resolver/pom.xml index 0ae8580,dc958f8..5a3188f --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + Apache Resolver</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-apache-xalan2/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-xalan2/pom.xml index cbb31fc,ecc33c6..daf124e --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + Xalan 2</name> <description>contains Xalan2-specific features</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-commons-logging/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-commons-logging/pom.xml index e19201e,fc7bb52..5d042a5 --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + Commons Logging</name> <description>Ant Listener based on commons-logging</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-commons-net/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-commons-net/pom.xml index 8709310,46c29e3..d03b6ec --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + Commons Net</name> <description>ftp, rexec and telnet tasks</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-jai/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-jai/pom.xml index c62a329,2ea59b9..a156dc3 --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + JAI</name> <description>image task and corresponding types. </description> @@@ -41,7 -41,7 +41,7 @@@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-javamail/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-javamail/pom.xml index 27f5aed,ae811a8..a080277 --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + JavaMail</name> <description>implementation of the mail task based on javamail. Required to send emails to SMTP servers using user/password combinations @@@ -41,7 -41,7 +41,7 @@@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-jdepend/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-jdepend/pom.xml index 1ea5c26,abdd834..d57b779 --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + JDepend</name> <description>task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the jdepend parser available on the maven repository</description> @@@ -41,7 -41,7 +41,7 @@@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-jmf/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-jmf/pom.xml index 992ec3f,1956ac6..eec1dca --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-jsch/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-jsch/pom.xml index 01a9f02,58c894b..19477b0 --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + JSch</name> <description>contains the sshexec and scp tasks </description> @@@ -40,7 -40,7 +40,7 @@@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-junit/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-junit/pom.xml index 6ee6dbf,587e44b..f0b5f80 --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + JUnit</name> <description>contains the junit and junirreport tasks</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-junit4/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-junit4/pom.xml index 4370396,7363ab2..5966cc5 --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + JUnit 4</name> <description>contains JUnit 4.x support</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-launcher/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-launcher/pom.xml index 81eba68,98dff6e..cb5886a --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant Launcher</name> <build> <plugins> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-netrexx/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-netrexx/pom.xml index fd8bdc2,47c3aee..bc5b82d --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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/05d69720/src/etc/poms/ant-swing/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-swing/pom.xml index 3e067a9,dcb27d2..9202675 --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant + Swing</name> <description>a listener and a splash task based on Swing</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant-testutil/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-testutil/pom.xml index b240021,8c93a73..3ae9d98 --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant Test Utilities</name> <description>test utility classes</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/ant/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant/pom.xml index 04ac892,45104cd..8a7b8ec --- 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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-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.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <name>Apache Ant Core</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/poms/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/pom.xml index be5d105,30942c9..bbb0ddb --- a/src/etc/poms/pom.xml +++ b/src/etc/poms/pom.xml @@@ -25,7 -25,7 +25,7 @@@ xsi:schemaLocation="http://maven.apache <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> - <version>1.9.9-SNAPSHOT</version> - <version>1.9.9</version> ++ <version>1.9.10-SNAPSHOT</version> <packaging>pom</packaging> <description>master POM</description> <licenses> http://git-wip-us.apache.org/repos/asf/ant/blob/05d69720/src/etc/testcases/taskdefs/conditions/antversion.xml ---------------------------------------------------------------------- diff --cc src/etc/testcases/taskdefs/conditions/antversion.xml index 42132c3,42132c3..ae274c8 --- 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.9" /> ++ <antversion exactly="1.9.10" /> </not> </condition> -- Should be exactly 1.9.9 ++ Should be exactly 1.9.10 </fail> </target> @@@ -45,10 -45,10 +45,10 @@@ <fail> <condition> <not> -- <antversion atleast="1.9.9" /> ++ <antversion atleast="1.9.10" /> </not> </condition> -- Should be at least 1.9.9 ++ Should be at least 1.9.10 </fail> </target> @@@ -57,10 -57,10 +57,10 @@@ <fail> <condition> <not> -- <antversion exactly="1.9.9" /> ++ <antversion exactly="1.9.10" /> </not> </condition> -- Should be exactly 1.9.9 ++ Should be exactly 1.9.10 </fail> </target> </project>
