diff --git a/ReleaseInstructions b/ReleaseInstructions index 0f17cf0a2..6cd36274d 100644 --- a/ReleaseInstructions +++ b/ReleaseInstructions @@ -230,6 +230,10 @@ Note: This document was adapted from the one created in the context of 21. checkout the master branch, merge the tag but don't push the commit + [if a release of Ant 1.9.x happened at the same time, deal with + the 1.9.x tag on the 1.9.x branch first and merge the 1.9.x branch + to master before proceeding here] + $ git checkout master $ git merge rel/1.10.0 diff --git a/WHATSNEW b/WHATSNEW index eeffe7944..cd71f3408 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -1,3 +1,6 @@ +Changes from Ant 1.10.0 TO Ant 1.10.1 +===================================== + Changes from Ant 1.9.7 TO Ant 1.10.0 ==================================== diff --git a/build.xml b/build.xml index 9e8cc1f59..43917ea54 100644 --- a/build.xml +++ b/build.xml @@ -34,10 +34,10 @@ - + - - + + diff --git a/manual/cover.html b/manual/cover.html index 59b8e4381..c8303ad95 100644 --- a/manual/cover.html +++ b/manual/cover.html @@ -19,14 +19,14 @@ -Apache Ant 1.10.0 User Manual +Apache Ant 1.10.1 User Manual

-

Apache Ant™ 1.10.0 Manual

-

This is the manual for version 1.10.0 of +

Apache Ant™ 1.10.1 Manual

+

This is the manual for version 1.10.1 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 d895dfd5e..5594e83c2 100644 --- a/manual/credits.html +++ b/manual/credits.html @@ -62,7 +62,7 @@

-

Version: 1.10.0

+

Version: 1.10.1

diff --git a/release/ivy.xml b/release/ivy.xml index f8e13c17d..1b26cf9be 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.10.1"/> diff --git a/src/etc/poms/ant-antlr/pom.xml b/src/etc/poms/ant-antlr/pom.xml index 186191c82..9fbf4fdae 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-antlr - 1.10.0-SNAPSHOT + 1.10.1-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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT true compile diff --git a/src/etc/poms/ant-apache-bcel/pom.xml b/src/etc/poms/ant-apache-bcel/pom.xml index 610a387dd..ce35715c4 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-bcel - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT Apache Ant + BCEL org.apache.ant ant - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-bsf/pom.xml b/src/etc/poms/ant-apache-bsf/pom.xml index b757de0bb..064d69617 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-bsf - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT Apache Ant + BSF org.apache.ant ant - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-log4j/pom.xml b/src/etc/poms/ant-apache-log4j/pom.xml index 4b48e2b47..7fc1038a6 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-log4j - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT Apache Ant + Log4J org.apache.ant ant - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-oro/pom.xml b/src/etc/poms/ant-apache-oro/pom.xml index 30569e1d9..42e889dee 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-oro - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT Apache Ant + Apache Oro org.apache.ant ant - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-regexp/pom.xml b/src/etc/poms/ant-apache-regexp/pom.xml index 9fcafc836..c6430ae0d 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-regexp - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT Apache Ant + Apache Regexp org.apache.ant ant - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-resolver/pom.xml b/src/etc/poms/ant-apache-resolver/pom.xml index 03c017cd5..015ca24f8 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-resolver - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT Apache Ant + Apache Resolver org.apache.ant ant - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile diff --git a/src/etc/poms/ant-apache-xalan2/pom.xml b/src/etc/poms/ant-apache-xalan2/pom.xml index 3e49f1d52..06fead68f 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-apache-xalan2 - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT Apache Ant + Xalan 2 contains Xalan2-specific features org.apache.ant ant - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile diff --git a/src/etc/poms/ant-commons-logging/pom.xml b/src/etc/poms/ant-commons-logging/pom.xml index 51ce03818..dbd6f1a0b 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-commons-logging - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT Apache Ant + Commons Logging Ant Listener based on commons-logging org.apache.ant ant - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile diff --git a/src/etc/poms/ant-commons-net/pom.xml b/src/etc/poms/ant-commons-net/pom.xml index 8e08ec58d..e96b0a6c4 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-commons-net - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT Apache Ant + Commons Net ftp, rexec and telnet tasks org.apache.ant ant - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile diff --git a/src/etc/poms/ant-jai/pom.xml b/src/etc/poms/ant-jai/pom.xml index 7d3d9f3d2..89c5de967 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jai - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT Apache Ant + JAI image task and corresponding types. @@ -41,7 +41,7 @@ org.apache.ant ant - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml index ac364793e..cb9f1c9d8 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-javamail - 1.10.0-SNAPSHOT + 1.10.1-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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile diff --git a/src/etc/poms/ant-jdepend/pom.xml b/src/etc/poms/ant-jdepend/pom.xml index 2f35da308..8e5ed8088 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jdepend - 1.10.0-SNAPSHOT + 1.10.1-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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile diff --git a/src/etc/poms/ant-jmf/pom.xml b/src/etc/poms/ant-jmf/pom.xml index d040c223e..9ef4769bf 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jmf - 1.10.0-SNAPSHOT + 1.10.1-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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile diff --git a/src/etc/poms/ant-jsch/pom.xml b/src/etc/poms/ant-jsch/pom.xml index 1273d8717..387ebbde5 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-jsch - 1.10.0-SNAPSHOT + 1.10.1-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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile diff --git a/src/etc/poms/ant-junit/pom.xml b/src/etc/poms/ant-junit/pom.xml index 7ba833ea7..79bdb3dac 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-junit - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT Apache Ant + JUnit contains the junit and junirreport tasks org.apache.ant ant - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile diff --git a/src/etc/poms/ant-junit4/pom.xml b/src/etc/poms/ant-junit4/pom.xml index 7e66219bd..595fb3f03 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-junit4 - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT Apache Ant + JUnit 4 contains JUnit 4.x support org.apache.ant ant - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile diff --git a/src/etc/poms/ant-launcher/pom.xml b/src/etc/poms/ant-launcher/pom.xml index 8f9556951..b8b81d270 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-launcher - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT Apache Ant Launcher diff --git a/src/etc/poms/ant-netrexx/pom.xml b/src/etc/poms/ant-netrexx/pom.xml index 502dbe388..33eb2c65c 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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 4.0.0 http://ant.apache.org/ org.apache.ant ant-netrexx - 1.10.0-SNAPSHOT + 1.10.1-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.10.0-SNAPSHOT + 1.10.1-SNAPSHOT compile