diff --git a/ReleaseInstructions b/ReleaseInstructions index 18f0f45ee..ff494b6a0 100644 --- a/ReleaseInstructions +++ b/ReleaseInstructions @@ -286,7 +286,8 @@ Note: This document was updated in the context of releasing Ant * ivy.xml in release subdirectory * WHATSNEW (add a new section) * src/etc/testcases/taskdefs/conditions/antversion.xml - * snap/snapcraft.yml (bump version to [newversion]alpha) + * snap/snapcraft.yml (bump version to [newversion]alpha and set grade + to devel) Amend the merge commit diff --git a/WHATSNEW b/WHATSNEW index 89b4cfa72..ba647fbc7 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -1,3 +1,6 @@ +Changes from Ant 1.9.16 TO Ant 1.9.17 +===================================== + Changes from Ant 1.9.15 TO Ant 1.9.16 ===================================== @@ -13,6 +16,8 @@ Fixed bugs: central repository didn't contain any source files. Bugzilla Report 65110 + * fixed potential OutOfMemory errors when reading broken archives + using the tar or zip formats or formats derived from zip. Changes from Ant 1.9.14 TO Ant 1.9.15 ===================================== diff --git a/build.xml b/build.xml index 01cda3fd0..56f450a65 100644 --- a/build.xml +++ b/build.xml @@ -33,10 +33,10 @@ - + - - + + diff --git a/manual/cover.html b/manual/cover.html index fc665e031..62ae2d38d 100644 --- a/manual/cover.html +++ b/manual/cover.html @@ -19,14 +19,14 @@ -Apache Ant 1.9.16 User Manual +Apache Ant 1.9.17 User Manual

-

Apache Ant™ 1.9.16 Manual

-

This is the manual for version 1.9.16 of +

Apache Ant™ 1.9.17 Manual

+

This is the manual for version 1.9.17 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 000952fef..c29df94b1 100644 --- a/manual/credits.html +++ b/manual/credits.html @@ -61,7 +61,7 @@

-

Version: 1.9.16

+

Version: 1.9.17

diff --git a/release/ivy.xml b/release/ivy.xml index 7810de5fc..ebb2a130c 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.17"/> diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 844729609..c644c82be 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -14,7 +14,7 @@ # limitations under the License. name: ant -version: "1.9.16alpha" +version: "1.9.17alpha" summary: Apache Ant description: | Apache Ant™ is a Java library and command-line tool whose mission is diff --git a/src/etc/poms/ant-antlr/pom.xml b/src/etc/poms/ant-antlr/pom.xml index 2e73c9d29..87e3c8c7a 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-antlr - 1.9.16-SNAPSHOT + 1.9.17-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.16-SNAPSHOT + 1.9.17-SNAPSHOT true compile diff --git a/src/etc/poms/ant-apache-bcel/pom.xml b/src/etc/poms/ant-apache-bcel/pom.xml index faec5fcb2..554643e15 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-bcel - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT Apache Ant + BCEL org.apache.ant ant - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-bsf/pom.xml b/src/etc/poms/ant-apache-bsf/pom.xml index cfe739b0d..399a41a5a 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-bsf - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT Apache Ant + BSF org.apache.ant ant - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-log4j/pom.xml b/src/etc/poms/ant-apache-log4j/pom.xml index 86320142d..33262eef5 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-log4j - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT Apache Ant + Log4J org.apache.ant ant - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-oro/pom.xml b/src/etc/poms/ant-apache-oro/pom.xml index cd4d259aa..fb374371c 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-oro - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT Apache Ant + Apache Oro org.apache.ant ant - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-regexp/pom.xml b/src/etc/poms/ant-apache-regexp/pom.xml index 03d4ea7e9..ed45f6c2c 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-regexp - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT Apache Ant + Apache Regexp org.apache.ant ant - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-resolver/pom.xml b/src/etc/poms/ant-apache-resolver/pom.xml index 76aee27b3..abc6dd350 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-resolver - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT Apache Ant + Apache Resolver org.apache.ant ant - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-xalan2/pom.xml b/src/etc/poms/ant-apache-xalan2/pom.xml index 797d11ce1..1dc0e440f 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-xalan2 - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT Apache Ant + Xalan 2 contains Xalan2-specific features org.apache.ant ant - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT compile diff --git a/src/etc/poms/ant-commons-logging/pom.xml b/src/etc/poms/ant-commons-logging/pom.xml index f33f8f870..a83eaddd9 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-commons-logging - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT Apache Ant + Commons Logging Ant Listener based on commons-logging org.apache.ant ant - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT compile diff --git a/src/etc/poms/ant-commons-net/pom.xml b/src/etc/poms/ant-commons-net/pom.xml index 0005ca307..caefda50d 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-commons-net - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT Apache Ant + Commons Net ftp, rexec and telnet tasks org.apache.ant ant - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT compile diff --git a/src/etc/poms/ant-jai/pom.xml b/src/etc/poms/ant-jai/pom.xml index b895fbb1c..f2d82206d 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jai - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT Apache Ant + JAI image task and corresponding types. @@ -41,7 +41,7 @@ org.apache.ant ant - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT compile diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml index b9846c251..9765ca527 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-javamail - 1.9.16-SNAPSHOT + 1.9.17-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.16-SNAPSHOT + 1.9.17-SNAPSHOT compile diff --git a/src/etc/poms/ant-jdepend/pom.xml b/src/etc/poms/ant-jdepend/pom.xml index 12fa8acf2..aeb76de17 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jdepend - 1.9.16-SNAPSHOT + 1.9.17-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.16-SNAPSHOT + 1.9.17-SNAPSHOT compile diff --git a/src/etc/poms/ant-jmf/pom.xml b/src/etc/poms/ant-jmf/pom.xml index be4e3b2c0..3c2875693 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jmf - 1.9.16-SNAPSHOT + 1.9.17-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.16-SNAPSHOT + 1.9.17-SNAPSHOT compile diff --git a/src/etc/poms/ant-jsch/pom.xml b/src/etc/poms/ant-jsch/pom.xml index 3836005e6..ffd671ee7 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jsch - 1.9.16-SNAPSHOT + 1.9.17-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.16-SNAPSHOT + 1.9.17-SNAPSHOT compile diff --git a/src/etc/poms/ant-junit/pom.xml b/src/etc/poms/ant-junit/pom.xml index 748b1ea38..82b3aa6f3 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-junit - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT Apache Ant + JUnit contains the junit and junirreport tasks org.apache.ant ant - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT compile diff --git a/src/etc/poms/ant-junit4/pom.xml b/src/etc/poms/ant-junit4/pom.xml index a5912c298..164668a69 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-junit4 - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT Apache Ant + JUnit 4 contains JUnit 4.x support org.apache.ant ant - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT compile diff --git a/src/etc/poms/ant-launcher/pom.xml b/src/etc/poms/ant-launcher/pom.xml index 7cfb5494b..ceef1da25 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-launcher - 1.9.16-SNAPSHOT + 1.9.17-SNAPSHOT Apache Ant Launcher diff --git a/src/etc/poms/ant-netrexx/pom.xml b/src/etc/poms/ant-netrexx/pom.xml index e95dce83a..8728a0a44 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.16-SNAPSHOT + 1.9.17-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-netrexx - 1.9.16-SNAPSHOT + 1.9.17-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.16-SNAPSHOT + 1.9.17-SNAPSHOT compile