Merge tag 'rel/1.9.11' into 1.9.x Tagging version 1.9.11 of Ant
# gpg: WARNING: unsafe permissions on homedir '/home/stefan/.gnupg' # gpg: keyserver option 'ca-cert-file' is obsolete; please use 'hkp-cacert' in dirmngr.conf # gpg: keyserver option 'no-try-dns-srv' is unknown # gpg: Signature made Di 27 Mär 2018 20:18:48 CEST # gpg: using DSA key A2115AE15F6B8B72 # gpg: issuer "[email protected]" # gpg: Oops: keyid_from_fingerprint: no pubkey # gpg: Oops: keyid_from_fingerprint: no pubkey # gpg: key 0000000000000000 occurs more than once in the trustdb # gpg: Good signature from "Stefan Bodewig <[email protected]>" [ultimate] # gpg: aka "Stefan Bodewig <[email protected]>" [ultimate] # gpg: aka "Stefan Bodewig <[email protected]>" [ultimate] # Primary key fingerprint: CE80 75A2 5154 7BEE 249B C151 A211 5AE1 5F6B 8B72 Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/49793c93 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/49793c93 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/49793c93 Branch: refs/heads/master Commit: 49793c9379e9878a135434684a4cd354dd434207 Parents: 3f1cec6 6f58cfd Author: Stefan Bodewig <[email protected]> Authored: Tue Mar 27 20:58:39 2018 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Tue Mar 27 21:02:43 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-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/49793c93/WHATSNEW ---------------------------------------------------------------------- diff --cc WHATSNEW index 1011201,1011201..d5081bf --- a/WHATSNEW +++ b/WHATSNEW @@@ -1,3 -1,3 +1,6 @@@ ++Changes from Ant 1.9.11 TO Ant 1.9.12 ++===================================== ++ Changes from Ant 1.9.10 TO Ant 1.9.11 ===================================== http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/build.xml ---------------------------------------------------------------------- diff --cc build.xml index 89e9d2b,56c6996..4ebf6d0 --- a/build.xml +++ b/build.xml @@@ -33,10 -33,10 +33,10 @@@ <property name="name" value="ant"/> <!-- this is the directory corresponding to groupId of Ant in the Maven repository --> <property name="groupid" value="org/apache/ant"/> - <property name="project.version" value="1.9.11alpha"/> - <property name="project.version" value="1.9.11"/> ++ <property name="project.version" value="1.9.12alpha"/> <!-- 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.11-SNAPSHOT"/> - <property name="pom.version" value="1.9.11"/> -- <property name="manifest-version" value="1.9.11"/> ++ <property name="pom.version" value="1.9.12-SNAPSHOT"/> ++ <property name="manifest-version" value="1.9.12"/> <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/49793c93/manual/cover.html ---------------------------------------------------------------------- diff --cc manual/cover.html index 4612e52,4612e52..78af6a1 --- 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.11 User Manual</title> ++<title>Apache Ant 1.9.12 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.11 Manual</h1> -- <p align="left">This is the manual for version 1.9.11 of ++ <h1>Apache Ant™ 1.9.12 Manual</h1> ++ <p align="left">This is the manual for version 1.9.12 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/49793c93/manual/credits.html ---------------------------------------------------------------------- diff --cc manual/credits.html index 97fee5c,97fee5c..6f26f41 --- a/manual/credits.html +++ b/manual/credits.html @@@ -62,7 -62,7 +62,7 @@@ </ul> <center> --<p>Version: 1.9.11</p> ++<p>Version: 1.9.12</p> </center> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/release/ivy.xml ---------------------------------------------------------------------- diff --cc release/ivy.xml index 005fa97,005fa97..88a0169 --- a/release/ivy.xml +++ b/release/ivy.xml @@@ -19,7 -19,7 +19,7 @@@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd";> <info organisation="org/apache" -- module="ant" revision="1.9.11"/> ++ module="ant" revision="1.9.12"/> <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/49793c93/src/etc/poms/ant-antlr/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-antlr/pom.xml index 261f39d,dce6fed..aed6902f --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <optional>true</optional> <scope>compile</scope> </dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-apache-bcel/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-bcel/pom.xml index a0abc2a,2e1595e..026b4ac --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <name>Apache Ant + BCEL</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-apache-bsf/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-bsf/pom.xml index f685099,308992a..67408e4 --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <name>Apache Ant + BSF</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-apache-log4j/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-log4j/pom.xml index 607c08c,50791a9..26bc39e --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <name>Apache Ant + Log4J</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-apache-oro/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-oro/pom.xml index ed85d75,a258a13..46c1e0e --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <name>Apache Ant + Apache Oro</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-apache-regexp/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-regexp/pom.xml index b99a6da,a8013ea..00ff5b1 --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <name>Apache Ant + Apache Regexp</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-apache-resolver/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-resolver/pom.xml index fc8cc0c,100bf9d..bb526c4 --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <name>Apache Ant + Apache Resolver</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-apache-xalan2/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-xalan2/pom.xml index 3b7389b,554843e..d144d0f --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-commons-logging/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-commons-logging/pom.xml index 4eb0f42,fc097ac..ab61f33 --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-commons-net/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-commons-net/pom.xml index 6f556bc,c9515a9..fa2e0d1 --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-jai/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-jai/pom.xml index 9868807,97ca0ee..5b6abf6 --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-javamail/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-javamail/pom.xml index 31ee5ec,25dd74d..1273328 --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-jdepend/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-jdepend/pom.xml index bda3d7a,50e20b4..da88275 --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-jmf/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-jmf/pom.xml index db2918b,6e61a1f..4725573 --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-jsch/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-jsch/pom.xml index 5596c62,6208c70..4a14bb3 --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-junit/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-junit/pom.xml index 795badd,3c7adbd..6ef35a6 --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-junit4/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-junit4/pom.xml index 739fc81,a07c4ff..2792118 --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-launcher/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-launcher/pom.xml index 3c987af,c034db1..274a3fb --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <name>Apache Ant Launcher</name> <build> <plugins> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-netrexx/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-netrexx/pom.xml index 96734c6,d408d9f..4db12a5 --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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/49793c93/src/etc/poms/ant-swing/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-swing/pom.xml index 3a99964,c37f36b..52a4ef8 --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant-testutil/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-testutil/pom.xml index 40140b1,df211ab..9623f10 --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/ant/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant/pom.xml index af7d280,580ecc9..154d367 --- 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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-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.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <name>Apache Ant Core</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> - <version>1.9.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/poms/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/pom.xml index f75b31c,2ba8695..f4e5314 --- a/src/etc/poms/pom.xml +++ b/src/etc/poms/pom.xml @@@ -26,7 -26,7 +26,7 @@@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> - <version>1.9.11-SNAPSHOT</version> - <version>1.9.11</version> ++ <version>1.9.12-SNAPSHOT</version> <packaging>pom</packaging> <description>master POM</description> <licenses> http://git-wip-us.apache.org/repos/asf/ant/blob/49793c93/src/etc/testcases/taskdefs/conditions/antversion.xml ---------------------------------------------------------------------- diff --cc src/etc/testcases/taskdefs/conditions/antversion.xml index f70364d,f70364d..a1e7f54 --- 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.11" /> ++ <antversion exactly="1.9.12" /> </not> </condition> -- Should be exactly 1.9.11 ++ Should be exactly 1.9.12 </fail> </target> @@@ -45,10 -45,10 +45,10 @@@ <fail> <condition> <not> -- <antversion atleast="1.9.11" /> ++ <antversion atleast="1.9.12" /> </not> </condition> -- Should be at least 1.9.11 ++ Should be at least 1.9.12 </fail> </target> @@@ -57,10 -57,10 +57,10 @@@ <fail> <condition> <not> -- <antversion exactly="1.9.11" /> ++ <antversion exactly="1.9.12" /> </not> </condition> -- Should be exactly 1.9.11 ++ Should be exactly 1.9.12 </fail> </target> </project>
