From 6cc06e519a21ab1f410396dddc47d684892310a5 Mon Sep 17 00:00:00 2001 From: Antoine Levy-Lambert Date: Wed, 30 Apr 2014 03:57:41 +0000 Subject: [PATCH] preparation for Ant 1.9.5 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1591186 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 12 ++++++++++++ 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, 92 insertions(+), 80 deletions(-) diff --git a/WHATSNEW b/WHATSNEW index 1e9b3398b..74e79b4c7 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -1,3 +1,15 @@ +Changes from Ant 1.9.4 TO Ant 1.9.5 +=================================== + +Changes that could break older environments: +------------------------------------------- + +Fixed bugs: +----------- + +Other changes: +-------------- + Changes from Ant 1.9.3 TO Ant 1.9.4 =================================== diff --git a/build.xml b/build.xml index fc23a21e9..41d139ffe 100644 --- a/build.xml +++ b/build.xml @@ -34,10 +34,10 @@ - + - - + + diff --git a/manual/cover.html b/manual/cover.html index 6437e9045..91a774757 100644 --- a/manual/cover.html +++ b/manual/cover.html @@ -19,14 +19,14 @@ -Apache Ant 1.9.4 User Manual +Apache Ant 1.9.5 User Manual

-

Apache Ant™ 1.9.4 Manual

-

This is the manual for version 1.9.4 of +

Apache Ant™ 1.9.5 Manual

+

This is the manual for version 1.9.5 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 1a1872b17..594762d3b 100644 --- a/manual/credits.html +++ b/manual/credits.html @@ -62,7 +62,7 @@

-

Version: 1.9.4

+

Version: 1.9.5

diff --git a/release/ivy.xml b/release/ivy.xml index 74d0de330..63e9caac4 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.5"/> diff --git a/src/etc/poms/ant-antlr/pom.xml b/src/etc/poms/ant-antlr/pom.xml index 86d0d4ae4..4cbb6d547 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-antlr - 1.9.4-SNAPSHOT + 1.9.5-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.4-SNAPSHOT + 1.9.5-SNAPSHOT true compile diff --git a/src/etc/poms/ant-apache-bcel/pom.xml b/src/etc/poms/ant-apache-bcel/pom.xml index 3eec5fa29..d226f1f05 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-bcel - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT Apache Ant + BCEL org.apache.ant ant - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-bsf/pom.xml b/src/etc/poms/ant-apache-bsf/pom.xml index 182eabe95..1a59b9e6b 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-bsf - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT Apache Ant + BSF org.apache.ant ant - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-log4j/pom.xml b/src/etc/poms/ant-apache-log4j/pom.xml index c2d635011..a9c087f31 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-log4j - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT Apache Ant + Log4J org.apache.ant ant - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-oro/pom.xml b/src/etc/poms/ant-apache-oro/pom.xml index 2b3e08e6c..0f0cb15c5 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-oro - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT Apache Ant + Apache Oro org.apache.ant ant - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-regexp/pom.xml b/src/etc/poms/ant-apache-regexp/pom.xml index 517b527b1..7340d6abc 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-regexp - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT Apache Ant + Apache Regexp org.apache.ant ant - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-resolver/pom.xml b/src/etc/poms/ant-apache-resolver/pom.xml index cd9386f03..52399458e 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-resolver - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT Apache Ant + Apache Resolver org.apache.ant ant - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-xalan2/pom.xml b/src/etc/poms/ant-apache-xalan2/pom.xml index 34087ab5b..7e813850a 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-xalan2 - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT Apache Ant + Xalan 2 contains Xalan2-specific features org.apache.ant ant - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT compile diff --git a/src/etc/poms/ant-commons-logging/pom.xml b/src/etc/poms/ant-commons-logging/pom.xml index 1b6af66ed..6abc0b29a 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-commons-logging - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT Apache Ant + Commons Logging Ant Listener based on commons-logging org.apache.ant ant - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT compile diff --git a/src/etc/poms/ant-commons-net/pom.xml b/src/etc/poms/ant-commons-net/pom.xml index e6090edac..59bbb3280 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-commons-net - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT Apache Ant + Commons Net ftp, rexec and telnet tasks org.apache.ant ant - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT compile diff --git a/src/etc/poms/ant-jai/pom.xml b/src/etc/poms/ant-jai/pom.xml index a8290566f..a43b4a19a 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jai - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT Apache Ant + JAI image task and corresponding types. @@ -41,7 +41,7 @@ org.apache.ant ant - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT compile diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml index 0925780c3..8763998f1 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-javamail - 1.9.4-SNAPSHOT + 1.9.5-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.4-SNAPSHOT + 1.9.5-SNAPSHOT compile diff --git a/src/etc/poms/ant-jdepend/pom.xml b/src/etc/poms/ant-jdepend/pom.xml index 5fcd93f2d..acd65826c 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jdepend - 1.9.4-SNAPSHOT + 1.9.5-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.4-SNAPSHOT + 1.9.5-SNAPSHOT compile diff --git a/src/etc/poms/ant-jmf/pom.xml b/src/etc/poms/ant-jmf/pom.xml index 0ad73a1f9..b8d2b80ed 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jmf - 1.9.4-SNAPSHOT + 1.9.5-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.4-SNAPSHOT + 1.9.5-SNAPSHOT compile diff --git a/src/etc/poms/ant-jsch/pom.xml b/src/etc/poms/ant-jsch/pom.xml index 0ed918475..cefa2eff3 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jsch - 1.9.4-SNAPSHOT + 1.9.5-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.4-SNAPSHOT + 1.9.5-SNAPSHOT compile diff --git a/src/etc/poms/ant-junit/pom.xml b/src/etc/poms/ant-junit/pom.xml index 87a2b2821..e398c1ba5 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-junit - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT Apache Ant + JUnit contains the junit and junirreport tasks org.apache.ant ant - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT compile diff --git a/src/etc/poms/ant-junit4/pom.xml b/src/etc/poms/ant-junit4/pom.xml index 3f0fe17c0..b380de484 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-junit4 - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT Apache Ant + JUnit 4 contains JUnit 4.x support org.apache.ant ant - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT compile diff --git a/src/etc/poms/ant-launcher/pom.xml b/src/etc/poms/ant-launcher/pom.xml index d94fbd000..e29973e84 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-launcher - 1.9.4-SNAPSHOT + 1.9.5-SNAPSHOT Apache Ant Launcher diff --git a/src/etc/poms/ant-netrexx/pom.xml b/src/etc/poms/ant-netrexx/pom.xml index 8e30894f3..d1b2b7357 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.4-SNAPSHOT + 1.9.5-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-netrexx - 1.9.4-SNAPSHOT + 1.9.5-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.4-SNAPSHOT + 1.9.5-SNAPSHOT compile