Repository: ant Updated Branches: refs/heads/master de3dccde5 -> b2a33d114
bump versions Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/b2a33d11 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/b2a33d11 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/b2a33d11 Branch: refs/heads/master Commit: b2a33d11491a6760646345ceb9d98845e9068141 Parents: de3dccd Author: Stefan Bodewig <[email protected]> Authored: Sun May 31 16:52:18 2015 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Sun May 31 16:52:18 2015 +0200 ---------------------------------------------------------------------- WHATSNEW | 13 +++ 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 +- .../taskdefs/conditions/antversion.xml | 84 ++++++++++---------- 29 files changed, 129 insertions(+), 116 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/WHATSNEW ---------------------------------------------------------------------- diff --git a/WHATSNEW b/WHATSNEW index b41189b..0cacc73 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -1,3 +1,16 @@ +Changes from Ant 1.9.5 TO Ant 1.9.6 +=================================== + +Changes that could break older environments: +------------------------------------------- + +Fixed bugs: +----------- + +Other changes: +-------------- + + Changes from Ant 1.9.4 TO Ant 1.9.5 =================================== http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 159e88f..24b23ab 100644 --- a/build.xml +++ b/build.xml @@ -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.5alpha"/> + <property name="project.version" value="1.9.6alpha"/> <!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms --> - <property name="pom.version" value="1.9.5-SNAPSHOT"/> - <property name="manifest-version" value="1.9.5"/> + <property name="pom.version" value="1.9.6-SNAPSHOT"/> + <property name="manifest-version" value="1.9.6"/> <property name="bootstrap.jar" value="ant-bootstrap.jar"/> <property name="ant.package" value="org/apache/tools/ant"/> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/manual/cover.html ---------------------------------------------------------------------- diff --git a/manual/cover.html b/manual/cover.html index 91a7747..75ceb84 100644 --- a/manual/cover.html +++ b/manual/cover.html @@ -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.5 User Manual</title> +<title>Apache Ant 1.9.6 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.5 Manual</h1> - <p align="left">This is the manual for version 1.9.5 of + <h1>Apache Ant™ 1.9.6 Manual</h1> + <p align="left">This is the manual for version 1.9.6 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/b2a33d11/manual/credits.html ---------------------------------------------------------------------- diff --git a/manual/credits.html b/manual/credits.html index 594762d..72916de 100644 --- a/manual/credits.html +++ b/manual/credits.html @@ -62,7 +62,7 @@ </ul> <center> -<p>Version: 1.9.5</p> +<p>Version: 1.9.6</p> </center> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/release/ivy.xml ---------------------------------------------------------------------- diff --git a/release/ivy.xml b/release/ivy.xml index 63e9caa..cc95103 100644 --- a/release/ivy.xml +++ b/release/ivy.xml @@ -20,7 +20,7 @@ xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd";> <info organisation="org/apache" - module="ant" revision="1.9.5"/> + module="ant" revision="1.9.6"/> <publications xmlns:e="urn:ant.apache.org:ivy-extras"> <artifact name="ant-parent" type="pom" ext="pom"/> <artifact name="ant-parent" type="pom.asc" ext="pom.asc"/> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-antlr/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-antlr/pom.xml b/src/etc/poms/ant-antlr/pom.xml index 4cbb6d5..f2c0c21 100644 --- a/src/etc/poms/ant-antlr/pom.xml +++ b/src/etc/poms/ant-antlr/pom.xml @@ -27,13 +27,13 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-antlr</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + ANTLR</name> <description>antlr specific task. The implementation forks a java process, therefore the antlr jar file is only needed at runtime</description> @@ -41,7 +41,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <optional>true</optional> <scope>compile</scope> </dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-apache-bcel/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-apache-bcel/pom.xml b/src/etc/poms/ant-apache-bcel/pom.xml index d226f1f..2ef91bf 100644 --- a/src/etc/poms/ant-apache-bcel/pom.xml +++ b/src/etc/poms/ant-apache-bcel/pom.xml @@ -27,19 +27,19 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-bcel</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + BCEL</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-apache-bsf/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-apache-bsf/pom.xml b/src/etc/poms/ant-apache-bsf/pom.xml index 1a59b9e..af6fcf8 100644 --- a/src/etc/poms/ant-apache-bsf/pom.xml +++ b/src/etc/poms/ant-apache-bsf/pom.xml @@ -27,19 +27,19 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-bsf</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + BSF</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-apache-log4j/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-apache-log4j/pom.xml b/src/etc/poms/ant-apache-log4j/pom.xml index a9c087f..0fcfeda 100644 --- a/src/etc/poms/ant-apache-log4j/pom.xml +++ b/src/etc/poms/ant-apache-log4j/pom.xml @@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-log4j</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + Log4J</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-apache-oro/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-apache-oro/pom.xml b/src/etc/poms/ant-apache-oro/pom.xml index 0f0cb15..9308af7 100644 --- a/src/etc/poms/ant-apache-oro/pom.xml +++ b/src/etc/poms/ant-apache-oro/pom.xml @@ -27,19 +27,19 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-oro</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + Apache Oro</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-apache-regexp/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-apache-regexp/pom.xml b/src/etc/poms/ant-apache-regexp/pom.xml index 7340d6a..6ad6702 100644 --- a/src/etc/poms/ant-apache-regexp/pom.xml +++ b/src/etc/poms/ant-apache-regexp/pom.xml @@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-regexp</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + Apache Regexp</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-apache-resolver/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-apache-resolver/pom.xml b/src/etc/poms/ant-apache-resolver/pom.xml index 5239945..1606f5b 100644 --- a/src/etc/poms/ant-apache-resolver/pom.xml +++ b/src/etc/poms/ant-apache-resolver/pom.xml @@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-resolver</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + Apache Resolver</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-apache-xalan2/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-apache-xalan2/pom.xml b/src/etc/poms/ant-apache-xalan2/pom.xml index 7e81385..b58f5c3 100644 --- a/src/etc/poms/ant-apache-xalan2/pom.xml +++ b/src/etc/poms/ant-apache-xalan2/pom.xml @@ -26,20 +26,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-xalan2</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + Xalan 2</name> <description>contains Xalan2-specific features</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-commons-logging/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-commons-logging/pom.xml b/src/etc/poms/ant-commons-logging/pom.xml index 6abc0b2..b82c9ef 100644 --- a/src/etc/poms/ant-commons-logging/pom.xml +++ b/src/etc/poms/ant-commons-logging/pom.xml @@ -26,20 +26,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-commons-logging</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + Commons Logging</name> <description>Ant Listener based on commons-logging</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-commons-net/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-commons-net/pom.xml b/src/etc/poms/ant-commons-net/pom.xml index 59bbb32..1369fed 100644 --- a/src/etc/poms/ant-commons-net/pom.xml +++ b/src/etc/poms/ant-commons-net/pom.xml @@ -26,20 +26,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-commons-net</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + Commons Net</name> <description>ftp, rexec and telnet tasks</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-jai/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-jai/pom.xml b/src/etc/poms/ant-jai/pom.xml index a43b4a1..9b542c7 100644 --- a/src/etc/poms/ant-jai/pom.xml +++ b/src/etc/poms/ant-jai/pom.xml @@ -27,13 +27,13 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-jai</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + JAI</name> <description>image task and corresponding types. </description> @@ -41,7 +41,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-javamail/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml index 8763998..878541a 100644 --- a/src/etc/poms/ant-javamail/pom.xml +++ b/src/etc/poms/ant-javamail/pom.xml @@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-javamail</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + JavaMail</name> <description>implementation of the mail task based on javamail. Required to send emails to SMTP servers using user/password combinations @@ -41,7 +41,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-jdepend/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-jdepend/pom.xml b/src/etc/poms/ant-jdepend/pom.xml index acd6582..d9d2878 100644 --- a/src/etc/poms/ant-jdepend/pom.xml +++ b/src/etc/poms/ant-jdepend/pom.xml @@ -27,13 +27,13 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-jdepend</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + JDepend</name> <description>task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the jdepend parser available on the maven repository</description> @@ -41,7 +41,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-jmf/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-jmf/pom.xml b/src/etc/poms/ant-jmf/pom.xml index b8d2b80..50e4354 100644 --- a/src/etc/poms/ant-jmf/pom.xml +++ b/src/etc/poms/ant-jmf/pom.xml @@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-jmf</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + JMF</name> <description>contains the sound task and a soundplayer listener download the dependency from http://java.sun.com/products/java-media/jmf/</description> @@ -40,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-jsch/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-jsch/pom.xml b/src/etc/poms/ant-jsch/pom.xml index cefa2ef..5b79223 100644 --- a/src/etc/poms/ant-jsch/pom.xml +++ b/src/etc/poms/ant-jsch/pom.xml @@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-jsch</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + JSch</name> <description>contains the sshexec and scp tasks </description> @@ -40,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-junit/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-junit/pom.xml b/src/etc/poms/ant-junit/pom.xml index e398c1b..013ed84 100644 --- a/src/etc/poms/ant-junit/pom.xml +++ b/src/etc/poms/ant-junit/pom.xml @@ -26,20 +26,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-junit</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + JUnit</name> <description>contains the junit and junirreport tasks</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-junit4/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-junit4/pom.xml b/src/etc/poms/ant-junit4/pom.xml index ac6ed6f..81544ea 100644 --- a/src/etc/poms/ant-junit4/pom.xml +++ b/src/etc/poms/ant-junit4/pom.xml @@ -26,20 +26,20 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-junit4</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + JUnit 4</name> <description>contains JUnit 4.x support</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-launcher/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-launcher/pom.xml b/src/etc/poms/ant-launcher/pom.xml index e29973e..4cb2624 100644 --- a/src/etc/poms/ant-launcher/pom.xml +++ b/src/etc/poms/ant-launcher/pom.xml @@ -27,13 +27,13 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant Launcher</name> <build> <plugins> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-netrexx/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-netrexx/pom.xml b/src/etc/poms/ant-netrexx/pom.xml index d1b2b73..46eb1c9 100644 --- a/src/etc/poms/ant-netrexx/pom.xml +++ b/src/etc/poms/ant-netrexx/pom.xml @@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-netrexx</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + NetRexx</name> <description>NetRexxC task dependency can be downloaded from http://www.ibm.com/software/awdtools/netrexx/download.html</description> @@ -40,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <!-- Processed too early, before maven-antrun-plugin gets a chance to work: http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-swing/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-swing/pom.xml b/src/etc/poms/ant-swing/pom.xml index 1d1f175..00cb28e 100644 --- a/src/etc/poms/ant-swing/pom.xml +++ b/src/etc/poms/ant-swing/pom.xml @@ -27,20 +27,20 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-swing</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant + Swing</name> <description>a listener and a splash task based on Swing</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant-testutil/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-testutil/pom.xml b/src/etc/poms/ant-testutil/pom.xml index 154d8b4..b236497 100644 --- a/src/etc/poms/ant-testutil/pom.xml +++ b/src/etc/poms/ant-testutil/pom.xml @@ -27,20 +27,20 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-testutil</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant Test Utilities</name> <description>test utility classes</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/ant/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml index 9146c03..46c859b 100644 --- a/src/etc/poms/ant/pom.xml +++ b/src/etc/poms/ant/pom.xml @@ -27,19 +27,19 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <name>Apache Ant Core</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/poms/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/pom.xml b/src/etc/poms/pom.xml index eca903f..1a61871 100644 --- a/src/etc/poms/pom.xml +++ b/src/etc/poms/pom.xml @@ -25,7 +25,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> - <version>1.9.5-SNAPSHOT</version> + <version>1.9.6-SNAPSHOT</version> <packaging>pom</packaging> <description>master POM</description> <licenses> http://git-wip-us.apache.org/repos/asf/ant/blob/b2a33d11/src/etc/testcases/taskdefs/conditions/antversion.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/conditions/antversion.xml b/src/etc/testcases/taskdefs/conditions/antversion.xml index 31b6c7b..8a54cb0 100644 --- a/src/etc/testcases/taskdefs/conditions/antversion.xml +++ b/src/etc/testcases/taskdefs/conditions/antversion.xml @@ -17,50 +17,50 @@ --> <project name="testantversion" default="testatleast"> - <target name="testatleast"> - <fail> - <condition> - <not> - <antversion atleast="1.7" /> - </not> - </condition> - Should be at least 1.7 - </fail> - </target> + <target name="testatleast"> + <fail> + <condition> + <not> + <antversion atleast="1.7" /> + </not> + </condition> + Should be at least 1.7 + </fail> + </target> - <target name="testexactly"> - <fail> - <condition> - <not> - <antversion exactly="1.9.5" /> - </not> - </condition> - Should be exactly 1.9.5 + <target name="testexactly"> + <fail> + <condition> + <not> + <antversion exactly="1.9.6" /> + </not> + </condition> + Should be exactly 1.9.6 - </fail> - </target> + </fail> + </target> - <target name="testatleastfail"> - <property name="version" value="1.8.9" /> - <fail> - <condition> - <not> - <antversion atleast="1.9.5" /> - </not> - </condition> - Should be at least 1.9.5 - </fail> - </target> + <target name="testatleastfail"> + <property name="version" value="1.8.9" /> + <fail> + <condition> + <not> + <antversion atleast="1.9.6" /> + </not> + </condition> + Should be at least 1.9.6 + </fail> + </target> - <target name="testexactlyfail"> - <property name="version" value="1.8.0" /> - <fail> - <condition> - <not> - <antversion exactly="1.9.5" /> - </not> - </condition> - Should be exactly 1.9.5 - </fail> - </target> + <target name="testexactlyfail"> + <property name="version" value="1.8.0" /> + <fail> + <condition> + <not> + <antversion exactly="1.9.6" /> + </not> + </condition> + Should be exactly 1.9.6 + </fail> + </target> </project>
