Merge tag 'rel/1.10.1' and bump versions Tagging version 1.10.1 of Ant
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/79a34b8d Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/79a34b8d Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/79a34b8d Branch: refs/heads/master Commit: 79a34b8d20ac9c3aad58a30a98f36871fdabd83a Parents: ea2ef41 e003f5e Author: Stefan Bodewig <[email protected]> Authored: Mon Feb 6 15:24:56 2017 +0100 Committer: Stefan Bodewig <[email protected]> Committed: Mon Feb 6 15:27:34 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-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 ++-- 30 files changed, 82 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/WHATSNEW ---------------------------------------------------------------------- diff --cc WHATSNEW index 11e5bab,11e5bab..1ce7173 --- a/WHATSNEW +++ b/WHATSNEW @@@ -1,3 -1,3 +1,6 @@@ ++Changes from Ant 1.10.1 TO Ant 1.10.2 ++===================================== ++ Changes from Ant 1.10.0 TO Ant 1.10.1 ===================================== http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/build.xml ---------------------------------------------------------------------- diff --cc build.xml index 61737c5,c311cc7..a576e10 --- 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.10.1alpha"/> - <property name="project.version" value="1.10.1"/> ++ <property name="project.version" value="1.10.2alpha"/> <!-- 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.1-SNAPSHOT"/> - <property name="pom.version" value="1.10.1"/> -- <property name="manifest-version" value="1.10.1"/> ++ <property name="pom.version" value="1.10.2-SNAPSHOT"/> ++ <property name="manifest-version" value="1.10.2"/> <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/79a34b8d/manual/cover.html ---------------------------------------------------------------------- diff --cc manual/cover.html index c8303ad,c8303ad..e4912d9 --- 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.10.1 User Manual</title> ++<title>Apache Ant 1.10.2 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.10.1 Manual</h1> -- <p align="left">This is the manual for version 1.10.1 of ++ <h1>Apache Ant™ 1.10.2 Manual</h1> ++ <p align="left">This is the manual for version 1.10.2 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/79a34b8d/manual/credits.html ---------------------------------------------------------------------- diff --cc manual/credits.html index 5594e83,5594e83..f6cd947 --- a/manual/credits.html +++ b/manual/credits.html @@@ -62,7 -62,7 +62,7 @@@ </ul> <center> --<p>Version: 1.10.1</p> ++<p>Version: 1.10.2</p> </center> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/release/ivy.xml ---------------------------------------------------------------------- diff --cc release/ivy.xml index cdfd7f1,cdfd7f1..c146ea1 --- 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.10.1"/> ++ module="ant" revision="1.10.2"/> <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/79a34b8d/src/etc/poms/ant-antlr/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-antlr/pom.xml index 9fbf4fd,2bce692..f0b960c --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <optional>true</optional> <scope>compile</scope> </dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-apache-bcel/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-bcel/pom.xml index ce35715,3476e6e..c27da12 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <name>Apache Ant + BCEL</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-apache-bsf/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-bsf/pom.xml index 064d696,62b8a75..5fdea3f --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <name>Apache Ant + BSF</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-apache-log4j/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-log4j/pom.xml index 7fc1038,8a6a789..c689dd0 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <name>Apache Ant + Log4J</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-apache-oro/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-oro/pom.xml index 42e889d,d98cabc..0977d80 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <name>Apache Ant + Apache Oro</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-apache-regexp/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-regexp/pom.xml index c6430ae,0cbc7bb..6ae1064 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <name>Apache Ant + Apache Regexp</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-apache-resolver/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-resolver/pom.xml index 015ca24,36143cb..013f098 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <name>Apache Ant + Apache Resolver</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-apache-xalan2/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-xalan2/pom.xml index 06fead6,3c00a93..81fb681 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-commons-logging/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-commons-logging/pom.xml index dbd6f1a,797debe..0274c03 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-commons-net/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-commons-net/pom.xml index e96b0a6,e0c0737..b2534cc --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-jai/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-jai/pom.xml index 89c5de9,06adbeb..239f672 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-javamail/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-javamail/pom.xml index cb9f1c9,d9f3043..21a0304 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-jdepend/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-jdepend/pom.xml index 8e5ed80,6721c9a..bb71997 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-jmf/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-jmf/pom.xml index 9ef4769,0a1ba1f..d5fcf43 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-jsch/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-jsch/pom.xml index 387ebbd,9035cbf..b277d57 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-junit/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-junit/pom.xml index 79bdb3d,2906a28..4e0f9f8 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-junit4/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-junit4/pom.xml index 595fb3f,9c9e860..ad55409 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-launcher/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-launcher/pom.xml index b8b81d2,8179fcd..36e2a6f --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <name>Apache Ant Launcher</name> <build> <plugins> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-netrexx/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-netrexx/pom.xml index 33eb2c6,55dbddc..3c71be0 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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/79a34b8d/src/etc/poms/ant-swing/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-swing/pom.xml index 6a9faf8,acf7d71..50c6160 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-testutil/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-testutil/pom.xml index 081a023,5edbc81..59c73b6 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant-xz/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-xz/pom.xml index f7b1c2f,2b9e624..258ed90 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/ant/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant/pom.xml index 7986cff,0b8fc3f..755d0c8 --- 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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-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.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <name>Apache Ant Core</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> - <version>1.10.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/poms/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/pom.xml index 33b731e,7634043..5d48b1a --- 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.10.1-SNAPSHOT</version> - <version>1.10.1</version> ++ <version>1.10.2-SNAPSHOT</version> <packaging>pom</packaging> <description>master POM</description> <licenses> http://git-wip-us.apache.org/repos/asf/ant/blob/79a34b8d/src/etc/testcases/taskdefs/conditions/antversion.xml ---------------------------------------------------------------------- diff --cc src/etc/testcases/taskdefs/conditions/antversion.xml index 8440f1c,8440f1c..f4d2e7e --- 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.1" /> ++ <antversion exactly="1.10.2" /> </not> </condition> -- Should be exactly 1.10.1 ++ Should be exactly 1.10.2 </fail> </target>
