From cd458baf4df6e5ec05734dd887d04d1a62a33a7a Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Tue, 10 Jul 2018 06:33:54 +0200 Subject: [PATCH] merge rel/1.9.13 and prepare next iteration --- 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(-) diff --git a/WHATSNEW b/WHATSNEW index e65f3233b..e887ad56a 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -1,3 +1,6 @@ +Changes from Ant 1.9.13 TO Ant 1.9.14 +===================================== + Changes from Ant 1.9.12 TO Ant 1.9.13 ===================================== diff --git a/build.xml b/build.xml index 10fb5220a..52c88842d 100644 --- a/build.xml +++ b/build.xml @@ -33,10 +33,10 @@ - + - - + + diff --git a/manual/cover.html b/manual/cover.html index 42865e3e8..f94f17a21 100644 --- a/manual/cover.html +++ b/manual/cover.html @@ -19,14 +19,14 @@ -Apache Ant 1.9.13 User Manual +Apache Ant 1.9.14 User Manual

-

Apache Ant™ 1.9.13 Manual

-

This is the manual for version 1.9.13 of +

Apache Ant™ 1.9.14 Manual

+

This is the manual for version 1.9.14 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 03d82919a..240067dbf 100644 --- a/manual/credits.html +++ b/manual/credits.html @@ -61,7 +61,7 @@

-

Version: 1.9.13

+

Version: 1.9.14

diff --git a/release/ivy.xml b/release/ivy.xml index 8d4036d46..89367043b 100644 --- a/release/ivy.xml +++ b/release/ivy.xml @@ -19,7 +19,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"> + module="ant" revision="1.9.14"/> diff --git a/src/etc/poms/ant-antlr/pom.xml b/src/etc/poms/ant-antlr/pom.xml index f9b3550ee..b57cdff42 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-antlr - 1.9.13-SNAPSHOT + 1.9.14-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.13-SNAPSHOT + 1.9.14-SNAPSHOT true compile diff --git a/src/etc/poms/ant-apache-bcel/pom.xml b/src/etc/poms/ant-apache-bcel/pom.xml index c52d6e621..fe5f9b3b2 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-bcel - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT Apache Ant + BCEL org.apache.ant ant - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-bsf/pom.xml b/src/etc/poms/ant-apache-bsf/pom.xml index 5e03b34b0..86acd77db 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-bsf - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT Apache Ant + BSF org.apache.ant ant - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-log4j/pom.xml b/src/etc/poms/ant-apache-log4j/pom.xml index 8f6e98128..141fb733c 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-log4j - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT Apache Ant + Log4J org.apache.ant ant - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-oro/pom.xml b/src/etc/poms/ant-apache-oro/pom.xml index a69dd14ad..d73480327 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-oro - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT Apache Ant + Apache Oro org.apache.ant ant - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-regexp/pom.xml b/src/etc/poms/ant-apache-regexp/pom.xml index a8c02bccf..0d2ff3091 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-regexp - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT Apache Ant + Apache Regexp org.apache.ant ant - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-resolver/pom.xml b/src/etc/poms/ant-apache-resolver/pom.xml index 1d47d03de..ae188666d 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-resolver - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT Apache Ant + Apache Resolver org.apache.ant ant - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-xalan2/pom.xml b/src/etc/poms/ant-apache-xalan2/pom.xml index 14eb87b3c..ef9a6bf61 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-xalan2 - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT Apache Ant + Xalan 2 contains Xalan2-specific features org.apache.ant ant - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT compile diff --git a/src/etc/poms/ant-commons-logging/pom.xml b/src/etc/poms/ant-commons-logging/pom.xml index aa2213476..c4f9392ac 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-commons-logging - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT Apache Ant + Commons Logging Ant Listener based on commons-logging org.apache.ant ant - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT compile diff --git a/src/etc/poms/ant-commons-net/pom.xml b/src/etc/poms/ant-commons-net/pom.xml index 3c0576f13..c2765dcaf 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-commons-net - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT Apache Ant + Commons Net ftp, rexec and telnet tasks org.apache.ant ant - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT compile diff --git a/src/etc/poms/ant-jai/pom.xml b/src/etc/poms/ant-jai/pom.xml index 2918ca7ea..83b3ba1b3 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jai - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT Apache Ant + JAI image task and corresponding types. @@ -41,7 +41,7 @@ org.apache.ant ant - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT compile diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml index 328168b33..6213f9986 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-javamail - 1.9.13-SNAPSHOT + 1.9.14-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.13-SNAPSHOT + 1.9.14-SNAPSHOT compile diff --git a/src/etc/poms/ant-jdepend/pom.xml b/src/etc/poms/ant-jdepend/pom.xml index 06aa0db64..7f48f1129 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jdepend - 1.9.13-SNAPSHOT + 1.9.14-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.13-SNAPSHOT + 1.9.14-SNAPSHOT compile diff --git a/src/etc/poms/ant-jmf/pom.xml b/src/etc/poms/ant-jmf/pom.xml index 7e74d72e4..5a79a6cc8 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jmf - 1.9.13-SNAPSHOT + 1.9.14-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.13-SNAPSHOT + 1.9.14-SNAPSHOT compile diff --git a/src/etc/poms/ant-jsch/pom.xml b/src/etc/poms/ant-jsch/pom.xml index 6323fe89d..04bc28aae 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jsch - 1.9.13-SNAPSHOT + 1.9.14-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.13-SNAPSHOT + 1.9.14-SNAPSHOT compile diff --git a/src/etc/poms/ant-junit/pom.xml b/src/etc/poms/ant-junit/pom.xml index 4168ab864..f164e73b6 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-junit - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT Apache Ant + JUnit contains the junit and junirreport tasks org.apache.ant ant - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT compile diff --git a/src/etc/poms/ant-junit4/pom.xml b/src/etc/poms/ant-junit4/pom.xml index dcad11aac..1aa1722da 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-junit4 - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT Apache Ant + JUnit 4 contains JUnit 4.x support org.apache.ant ant - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT compile diff --git a/src/etc/poms/ant-launcher/pom.xml b/src/etc/poms/ant-launcher/pom.xml index d4a4d9849..fafec7961 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-launcher - 1.9.13-SNAPSHOT + 1.9.14-SNAPSHOT Apache Ant Launcher diff --git a/src/etc/poms/ant-netrexx/pom.xml b/src/etc/poms/ant-netrexx/pom.xml index ae5845adb..9ffa4f424 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.13-SNAPSHOT + 1.9.14-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-netrexx - 1.9.13-SNAPSHOT + 1.9.14-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.13-SNAPSHOT + 1.9.14-SNAPSHOT compile