From b2a33d11491a6760646345ceb9d98845e9068141 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sun, 31 May 2015 16:52:18 +0200 Subject: [PATCH] bump versions --- 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(-) diff --git a/WHATSNEW b/WHATSNEW index b41189b3d..0cacc73f8 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 =================================== diff --git a/build.xml b/build.xml index 159e88f3b..24b23abf4 100644 --- a/build.xml +++ b/build.xml @@ -34,10 +34,10 @@ - + - - + + diff --git a/manual/cover.html b/manual/cover.html index 91a774757..75ceb8421 100644 --- a/manual/cover.html +++ b/manual/cover.html @@ -19,14 +19,14 @@ -Apache Ant 1.9.5 User Manual +Apache Ant 1.9.6 User Manual

-

Apache Ant™ 1.9.5 Manual

-

This is the manual for version 1.9.5 of +

Apache Ant™ 1.9.6 Manual

+

This is the manual for version 1.9.6 of Apache Ant. If your version of Ant (as verified with ant -version) is older or newer than this diff --git a/manual/credits.html b/manual/credits.html index 594762d3b..72916def9 100644 --- a/manual/credits.html +++ b/manual/credits.html @@ -62,7 +62,7 @@

-

Version: 1.9.5

+

Version: 1.9.6

diff --git a/release/ivy.xml b/release/ivy.xml index 63e9caac4..cc95103c5 100644 --- a/release/ivy.xml +++ b/release/ivy.xml @@ -20,7 +20,7 @@ xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd"> + module="ant" revision="1.9.6"/> diff --git a/src/etc/poms/ant-antlr/pom.xml b/src/etc/poms/ant-antlr/pom.xml index 4cbb6d547..f2c0c21ec 100644 --- a/src/etc/poms/ant-antlr/pom.xml +++ b/src/etc/poms/ant-antlr/pom.xml @@ -27,13 +27,13 @@ org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-antlr - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + ANTLR antlr specific task. The implementation forks a java process, therefore the antlr jar file is only needed at runtime @@ -41,7 +41,7 @@ org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT true compile diff --git a/src/etc/poms/ant-apache-bcel/pom.xml b/src/etc/poms/ant-apache-bcel/pom.xml index d226f1f05..2ef91bfb5 100644 --- a/src/etc/poms/ant-apache-bcel/pom.xml +++ b/src/etc/poms/ant-apache-bcel/pom.xml @@ -27,19 +27,19 @@ org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-bcel - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + BCEL org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-bsf/pom.xml b/src/etc/poms/ant-apache-bsf/pom.xml index 1a59b9e6b..af6fcf82e 100644 --- a/src/etc/poms/ant-apache-bsf/pom.xml +++ b/src/etc/poms/ant-apache-bsf/pom.xml @@ -27,19 +27,19 @@ org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-bsf - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + BSF org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-log4j/pom.xml b/src/etc/poms/ant-apache-log4j/pom.xml index a9c087f31..0fcfedaff 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 org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-log4j - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + Log4J org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-oro/pom.xml b/src/etc/poms/ant-apache-oro/pom.xml index 0f0cb15c5..9308af7b9 100644 --- a/src/etc/poms/ant-apache-oro/pom.xml +++ b/src/etc/poms/ant-apache-oro/pom.xml @@ -27,19 +27,19 @@ org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-oro - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + Apache Oro org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-regexp/pom.xml b/src/etc/poms/ant-apache-regexp/pom.xml index 7340d6abc..6ad6702f7 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 org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-regexp - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + Apache Regexp org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-resolver/pom.xml b/src/etc/poms/ant-apache-resolver/pom.xml index 52399458e..1606f5bdf 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 org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-resolver - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + Apache Resolver org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-xalan2/pom.xml b/src/etc/poms/ant-apache-xalan2/pom.xml index 7e813850a..b58f5c3d4 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 org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-xalan2 - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + Xalan 2 contains Xalan2-specific features org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile diff --git a/src/etc/poms/ant-commons-logging/pom.xml b/src/etc/poms/ant-commons-logging/pom.xml index 6abc0b29a..b82c9ef25 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 org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-commons-logging - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + Commons Logging Ant Listener based on commons-logging org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile diff --git a/src/etc/poms/ant-commons-net/pom.xml b/src/etc/poms/ant-commons-net/pom.xml index 59bbb3280..1369fede0 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 org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-commons-net - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + Commons Net ftp, rexec and telnet tasks org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile diff --git a/src/etc/poms/ant-jai/pom.xml b/src/etc/poms/ant-jai/pom.xml index a43b4a19a..9b542c730 100644 --- a/src/etc/poms/ant-jai/pom.xml +++ b/src/etc/poms/ant-jai/pom.xml @@ -27,13 +27,13 @@ org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jai - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + JAI image task and corresponding types. @@ -41,7 +41,7 @@ org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml index 8763998f1..878541a82 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 org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-javamail - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + JavaMail 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 org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile diff --git a/src/etc/poms/ant-jdepend/pom.xml b/src/etc/poms/ant-jdepend/pom.xml index acd65826c..d9d28785a 100644 --- a/src/etc/poms/ant-jdepend/pom.xml +++ b/src/etc/poms/ant-jdepend/pom.xml @@ -27,13 +27,13 @@ org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jdepend - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + JDepend task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the jdepend parser available on the maven repository @@ -41,7 +41,7 @@ org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile diff --git a/src/etc/poms/ant-jmf/pom.xml b/src/etc/poms/ant-jmf/pom.xml index b8d2b80ed..50e4354fa 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 org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jmf - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + JMF contains the sound task and a soundplayer listener download the dependency from http://java.sun.com/products/java-media/jmf/ @@ -40,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile diff --git a/src/etc/poms/ant-jsch/pom.xml b/src/etc/poms/ant-jsch/pom.xml index cefa2eff3..5b7922370 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 org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jsch - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + JSch contains the sshexec and scp tasks @@ -40,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile diff --git a/src/etc/poms/ant-junit/pom.xml b/src/etc/poms/ant-junit/pom.xml index e398c1ba5..013ed848d 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 org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-junit - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + JUnit contains the junit and junirreport tasks org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile diff --git a/src/etc/poms/ant-junit4/pom.xml b/src/etc/poms/ant-junit4/pom.xml index ac6ed6f4d..81544ea2e 100644 --- a/src/etc/poms/ant-junit4/pom.xml +++ b/src/etc/poms/ant-junit4/pom.xml @@ -26,20 +26,20 @@ org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-junit4 - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + JUnit 4 contains JUnit 4.x support org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile diff --git a/src/etc/poms/ant-launcher/pom.xml b/src/etc/poms/ant-launcher/pom.xml index e29973e84..4cb262473 100644 --- a/src/etc/poms/ant-launcher/pom.xml +++ b/src/etc/poms/ant-launcher/pom.xml @@ -27,13 +27,13 @@ org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-launcher - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant Launcher diff --git a/src/etc/poms/ant-netrexx/pom.xml b/src/etc/poms/ant-netrexx/pom.xml index d1b2b7357..46eb1c94d 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 org.apache.ant ant-parent ../pom.xml - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-netrexx - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT Apache Ant + NetRexx NetRexxC task dependency can be downloaded from http://www.ibm.com/software/awdtools/netrexx/download.html @@ -40,7 +40,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma org.apache.ant ant - 1.9.5-SNAPSHOT + 1.9.6-SNAPSHOT compile - - - - - - - - Should be at least 1.7 - - + + + + + + + + Should be at least 1.7 + + - - - - - - - - Should be exactly 1.9.5 + + + + + + + + Should be exactly 1.9.6 - - + + - - - - - - - - - Should be at least 1.9.5 - - + + + + + + + + + Should be at least 1.9.6 + + - - - - - - - - - Should be exactly 1.9.5 - - + + + + + + + + + Should be exactly 1.9.6 + +