Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Hi, We've uploaded Ant 1.9.8 in January and we quickly had to fix a regression breaking several packages (#850553). The modification was reported and applied upstream. A new 1.9.9 release was rolled shortly after, consisting in only this fix and another modification for Solaris. I'd like to request the permission to upload ant/1.9.9-1 to unstable and have it unblocked for a transition to stretch. This new release is basically identical to the patched version we already have in stretch. It would be good for clarity since end users may not be aware that the regression was fixed in our version of Ant 1.9.8. Thank you, Emmanuel Bourg unblock ant/1.9.9-1
diff -Nru ant-1.9.8/build.xml ant-1.9.9/build.xml --- ant-1.9.8/build.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/build.xml 2017-02-02 18:55:08.000000000 +0100 @@ -34,10 +34,10 @@ <property name="name" value="ant"/> <!-- this is the groupId of ant in the Maven repository --> <property name="groupid" value="org/apache/ant"/> - <property name="project.version" value="1.9.8"/> + <property name="project.version" value="1.9.9"/> <!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms --> - <property name="pom.version" value="1.9.8"/> - <property name="manifest-version" value="1.9.8"/> + <property name="pom.version" value="1.9.9"/> + <property name="manifest-version" value="1.9.9"/> <property name="bootstrap.jar" value="ant-bootstrap.jar"/> <property name="ant.package" value="org/apache/tools/ant"/> diff -Nru ant-1.9.8/debian/changelog ant-1.9.9/debian/changelog --- ant-1.9.8/debian/changelog 2017-01-19 10:41:24.000000000 +0100 +++ ant-1.9.9/debian/changelog 2017-02-26 21:19:40.000000000 +0100 @@ -1,3 +1,11 @@ +ant (1.9.9-1) unstable; urgency=medium + + * Team upload. + * New upstream release + - Removed 0012-BZ-60582.patch (fixed upstream) + + -- Emmanuel Bourg <ebo...@apache.org> Sun, 26 Feb 2017 21:19:40 +0100 + ant (1.9.8-3) unstable; urgency=medium * Removed the newly introduced final modifier on Path.systemClasspath diff -Nru ant-1.9.8/debian/patches/0012-BZ-60582.patch ant-1.9.9/debian/patches/0012-BZ-60582.patch --- ant-1.9.8/debian/patches/0012-BZ-60582.patch 2017-01-19 10:15:51.000000000 +0100 +++ ant-1.9.9/debian/patches/0012-BZ-60582.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -Description: Remove the final modifier on Path.systemClasspath -Origin: backport, https://github.com/apache/ant/commit/984a03d -Bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=60582 -Bug-Debian: https://bugs.debian.org/850553 ---- a/src/main/org/apache/tools/ant/types/Path.java -+++ b/src/main/org/apache/tools/ant/types/Path.java -@@ -66,8 +66,9 @@ - public class Path extends DataType implements Cloneable, ResourceCollection { - // CheckStyle:VisibilityModifier OFF - bc - -+ // non-final as some IDE integrations (at least Eclipse) want to override it - /** The system classpath as a Path object */ -- public static final Path systemClasspath = -+ public static Path systemClasspath = //NOSONAR - new Path(null, System.getProperty("java.class.path")); - - diff -Nru ant-1.9.8/debian/patches/series ant-1.9.9/debian/patches/series --- ant-1.9.8/debian/patches/series 2017-01-19 10:13:03.000000000 +0100 +++ ant-1.9.9/debian/patches/series 2017-02-26 18:51:18.000000000 +0100 @@ -1,4 +1,3 @@ 0009-reproducible-timestamp-task.patch 0010-reproducible-javadoc-task.patch 0011-reproducible-propertyfile-task.patch -0012-BZ-60582.patch diff -Nru ant-1.9.8/manual/cover.html ant-1.9.9/manual/cover.html --- ant-1.9.8/manual/cover.html 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/manual/cover.html 2017-02-02 18:55:08.000000000 +0100 @@ -19,14 +19,14 @@ <head> <meta http-equiv="Content-Language" content="en-us"> <link rel="stylesheet" type="text/css" href="stylesheets/style.css"> -<title>Apache Ant 1.9.8 User Manual</title> +<title>Apache Ant 1.9.9 User Manual</title> </head> <body bgcolor="#FFFFFF"> <div align="center"> <h1><img src="images/ant_logo_large.gif" width="190" height="120"></h1> - <h1>Apache Ant™ 1.9.8 Manual</h1> - <p align="left">This is the manual for version 1.9.8 of + <h1>Apache Ant™ 1.9.9 Manual</h1> + <p align="left">This is the manual for version 1.9.9 of <a target="_top" href="http://ant.apache.org/index.html";>Apache Ant</a>. If your version of Ant (as verified with <tt>ant -version</tt>) is older or newer than this diff -Nru ant-1.9.8/manual/credits.html ant-1.9.9/manual/credits.html --- ant-1.9.8/manual/credits.html 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/manual/credits.html 2017-02-02 18:55:08.000000000 +0100 @@ -62,7 +62,7 @@ </ul> <center> -<p>Version: 1.9.8</p> +<p>Version: 1.9.9</p> </center> diff -Nru ant-1.9.8/manual/projecthelper.html ant-1.9.9/manual/projecthelper.html --- ant-1.9.8/manual/projecthelper.html 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/manual/projecthelper.html 2017-02-02 18:55:08.000000000 +0100 @@ -70,13 +70,13 @@ service declarations in the META-INF: it searches in the classpath for a file <code>META-INF/services/org.apache.tools.ant.ProjectHelper</code>. This file will just contain the fully qualified name of the - implementation of <code>ProjectHelper</code> to instanciate;</li> + implementation of <code>ProjectHelper</code> to instantiate;</li> <li>it will also search with the system class loader for <code>ProjectHelper</code> service declarations in the META-INF;</li> <li>last but not least it will add its default <code>ProjectHelper</code> that can parse classical build.xml files.</li> </ul> -In case of an error while trying to instanciate a <code>ProjectHelper</code>, Ant +In case of an error while trying to instantiate a <code>ProjectHelper</code>, Ant will log an error but won't stop. If you want further debugging info about the <code>ProjectHelper</code> internal 'repository', use the <b>system</b> property <code>ant.project-helper-repo.debug</code> and set it to @@ -104,7 +104,7 @@ be implemented. So write your own <code>ProjectHelper</code> by extending that abstract class. You are then expected to implement at least the function <code>parse(Project project, Object source)</code>. Note also that your -implementation will be instanciated by Ant, and it is expecting a default +implementation will be instantiated by Ant, and it is expecting a default constructor with no arguments. </p> diff -Nru ant-1.9.8/NOTICE ant-1.9.9/NOTICE --- ant-1.9.8/NOTICE 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/NOTICE 2017-02-02 18:55:08.000000000 +0100 @@ -1,5 +1,5 @@ Apache Ant -Copyright 1999-2016 The Apache Software Foundation +Copyright 1999-2017 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff -Nru ant-1.9.8/src/etc/poms/ant/pom.xml ant-1.9.9/src/etc/poms/ant/pom.xml --- ant-1.9.8/src/etc/poms/ant/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -27,19 +27,19 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant Core</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-antlr/pom.xml ant-1.9.9/src/etc/poms/ant-antlr/pom.xml --- ant-1.9.8/src/etc/poms/ant-antlr/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-antlr/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -27,13 +27,13 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-antlr</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + ANTLR</name> <description>antlr specific task. The implementation forks a java process, therefore the antlr jar file is only needed at runtime</description> @@ -41,7 +41,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <optional>true</optional> <scope>compile</scope> </dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-apache-bcel/pom.xml ant-1.9.9/src/etc/poms/ant-apache-bcel/pom.xml --- ant-1.9.8/src/etc/poms/ant-apache-bcel/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-apache-bcel/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -27,19 +27,19 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-bcel</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + BCEL</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-apache-bsf/pom.xml ant-1.9.9/src/etc/poms/ant-apache-bsf/pom.xml --- ant-1.9.8/src/etc/poms/ant-apache-bsf/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-apache-bsf/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -27,19 +27,19 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-bsf</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + BSF</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-apache-log4j/pom.xml ant-1.9.9/src/etc/poms/ant-apache-log4j/pom.xml --- ant-1.9.8/src/etc/poms/ant-apache-log4j/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-apache-log4j/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -26,19 +26,19 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-log4j</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + Log4J</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-apache-oro/pom.xml ant-1.9.9/src/etc/poms/ant-apache-oro/pom.xml --- ant-1.9.8/src/etc/poms/ant-apache-oro/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-apache-oro/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -27,19 +27,19 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-oro</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + Apache Oro</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-apache-regexp/pom.xml ant-1.9.9/src/etc/poms/ant-apache-regexp/pom.xml --- ant-1.9.8/src/etc/poms/ant-apache-regexp/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-apache-regexp/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -26,19 +26,19 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-regexp</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + Apache Regexp</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-apache-resolver/pom.xml ant-1.9.9/src/etc/poms/ant-apache-resolver/pom.xml --- ant-1.9.8/src/etc/poms/ant-apache-resolver/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-apache-resolver/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -26,19 +26,19 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-resolver</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + Apache Resolver</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-apache-xalan2/pom.xml ant-1.9.9/src/etc/poms/ant-apache-xalan2/pom.xml --- ant-1.9.8/src/etc/poms/ant-apache-xalan2/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-apache-xalan2/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -26,20 +26,20 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-xalan2</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + Xalan 2</name> <description>contains Xalan2-specific features</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-commons-logging/pom.xml ant-1.9.9/src/etc/poms/ant-commons-logging/pom.xml --- ant-1.9.8/src/etc/poms/ant-commons-logging/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-commons-logging/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -26,20 +26,20 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-commons-logging</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + Commons Logging</name> <description>Ant Listener based on commons-logging</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-commons-net/pom.xml ant-1.9.9/src/etc/poms/ant-commons-net/pom.xml --- ant-1.9.8/src/etc/poms/ant-commons-net/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-commons-net/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -26,20 +26,20 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-commons-net</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + Commons Net</name> <description>ftp, rexec and telnet tasks</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-jai/pom.xml ant-1.9.9/src/etc/poms/ant-jai/pom.xml --- ant-1.9.8/src/etc/poms/ant-jai/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-jai/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -27,13 +27,13 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-jai</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + JAI</name> <description>image task and corresponding types. </description> @@ -41,7 +41,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-javamail/pom.xml ant-1.9.9/src/etc/poms/ant-javamail/pom.xml --- ant-1.9.8/src/etc/poms/ant-javamail/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-javamail/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -26,13 +26,13 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-javamail</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + JavaMail</name> <description>implementation of the mail task based on javamail. Required to send emails to SMTP servers using user/password combinations @@ -41,7 +41,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-jdepend/pom.xml ant-1.9.9/src/etc/poms/ant-jdepend/pom.xml --- ant-1.9.8/src/etc/poms/ant-jdepend/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-jdepend/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -27,13 +27,13 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-jdepend</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + JDepend</name> <description>task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the jdepend parser available on the maven repository</description> @@ -41,7 +41,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-jmf/pom.xml ant-1.9.9/src/etc/poms/ant-jmf/pom.xml --- ant-1.9.8/src/etc/poms/ant-jmf/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-jmf/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -26,13 +26,13 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-jmf</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + JMF</name> <description>contains the sound task and a soundplayer listener download the dependency from http://java.sun.com/products/java-media/jmf/</description> @@ -40,7 +40,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> </dependencies> diff -Nru ant-1.9.8/src/etc/poms/ant-jsch/pom.xml ant-1.9.9/src/etc/poms/ant-jsch/pom.xml --- ant-1.9.8/src/etc/poms/ant-jsch/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-jsch/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -26,13 +26,13 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-jsch</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + JSch</name> <description>contains the sshexec and scp tasks </description> @@ -40,7 +40,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-junit/pom.xml ant-1.9.9/src/etc/poms/ant-junit/pom.xml --- ant-1.9.8/src/etc/poms/ant-junit/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-junit/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -26,20 +26,20 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-junit</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + JUnit</name> <description>contains the junit and junirreport tasks</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-junit4/pom.xml ant-1.9.9/src/etc/poms/ant-junit4/pom.xml --- ant-1.9.8/src/etc/poms/ant-junit4/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-junit4/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -26,20 +26,20 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-junit4</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + JUnit 4</name> <description>contains JUnit 4.x support</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/ant-launcher/pom.xml ant-1.9.9/src/etc/poms/ant-launcher/pom.xml --- ant-1.9.8/src/etc/poms/ant-launcher/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-launcher/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -27,13 +27,13 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant Launcher</name> <build> <plugins> diff -Nru ant-1.9.8/src/etc/poms/ant-netrexx/pom.xml ant-1.9.9/src/etc/poms/ant-netrexx/pom.xml --- ant-1.9.8/src/etc/poms/ant-netrexx/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-netrexx/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -26,13 +26,13 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-netrexx</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + NetRexx</name> <description>NetRexxC task dependency can be downloaded from http://www.ibm.com/software/awdtools/netrexx/download.html</description> @@ -40,7 +40,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <!-- Processed too early, before maven-antrun-plugin gets a chance to work: diff -Nru ant-1.9.8/src/etc/poms/ant-swing/pom.xml ant-1.9.9/src/etc/poms/ant-swing/pom.xml --- ant-1.9.8/src/etc/poms/ant-swing/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-swing/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -27,20 +27,20 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-swing</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant + Swing</name> <description>a listener and a splash task based on Swing</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> </dependencies> diff -Nru ant-1.9.8/src/etc/poms/ant-testutil/pom.xml ant-1.9.9/src/etc/poms/ant-testutil/pom.xml --- ant-1.9.8/src/etc/poms/ant-testutil/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/ant-testutil/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -27,20 +27,20 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.8</version> + <version>1.9.9</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-testutil</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <name>Apache Ant Test Utilities</name> <description>test utility classes</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <scope>compile</scope> </dependency> <dependency> diff -Nru ant-1.9.8/src/etc/poms/pom.xml ant-1.9.9/src/etc/poms/pom.xml --- ant-1.9.8/src/etc/poms/pom.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/poms/pom.xml 2017-02-02 18:55:08.000000000 +0100 @@ -25,7 +25,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> - <version>1.9.8</version> + <version>1.9.9</version> <packaging>pom</packaging> <description>master POM</description> <licenses> diff -Nru ant-1.9.8/src/etc/testcases/taskdefs/conditions/antversion.xml ant-1.9.9/src/etc/testcases/taskdefs/conditions/antversion.xml --- ant-1.9.8/src/etc/testcases/taskdefs/conditions/antversion.xml 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/etc/testcases/taskdefs/conditions/antversion.xml 2017-02-02 18:55:08.000000000 +0100 @@ -32,10 +32,10 @@ <fail> <condition> <not> - <antversion exactly="1.9.8" /> + <antversion exactly="1.9.9" /> </not> </condition> - Should be exactly 1.9.8 + Should be exactly 1.9.9 </fail> </target> @@ -45,10 +45,10 @@ <fail> <condition> <not> - <antversion atleast="1.9.8" /> + <antversion atleast="1.9.9" /> </not> </condition> - Should be at least 1.9.8 + Should be at least 1.9.9 </fail> </target> @@ -57,10 +57,10 @@ <fail> <condition> <not> - <antversion exactly="1.9.8" /> + <antversion exactly="1.9.9" /> </not> </condition> - Should be exactly 1.9.8 + Should be exactly 1.9.9 </fail> </target> </project> diff -Nru ant-1.9.8/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java ant-1.9.9/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java --- ant-1.9.8/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java 2017-02-02 18:55:08.000000000 +0100 @@ -48,7 +48,7 @@ private static final String DEBUG_ARGUMENT_PROCESSOR_REPOSITORY = "ant.argument-processor-repo.debug"; // The message log level is not accessible here because everything - // is instanciated statically + // is instantiated statically private static final boolean DEBUG = "true".equals(System.getProperty(DEBUG_ARGUMENT_PROCESSOR_REPOSITORY)); private static final String SERVICE_ID = "META-INF/services/org.apache.tools.ant.ArgumentProcessor"; @@ -128,7 +128,7 @@ } catch (Exception e) { throw new BuildException("The argument processor class" + processorClass.getClass().getName() - + " could not be instanciated with a default constructor", + + " could not be instantiated with a default constructor", e); } return processor; diff -Nru ant-1.9.8/src/main/org/apache/tools/ant/ProjectHelperRepository.java ant-1.9.9/src/main/org/apache/tools/ant/ProjectHelperRepository.java --- ant-1.9.8/src/main/org/apache/tools/ant/ProjectHelperRepository.java 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/main/org/apache/tools/ant/ProjectHelperRepository.java 2017-02-02 18:55:08.000000000 +0100 @@ -46,7 +46,7 @@ "ant.project-helper-repo.debug"; // The message log level is not accessible here because everything - // is instanciated statically + // is instantiated statically private static final boolean DEBUG = "true".equals(System.getProperty(DEBUG_PROJECT_HELPER_REPOSITORY)); diff -Nru ant-1.9.8/src/main/org/apache/tools/ant/types/Path.java ant-1.9.9/src/main/org/apache/tools/ant/types/Path.java --- ant-1.9.8/src/main/org/apache/tools/ant/types/Path.java 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/main/org/apache/tools/ant/types/Path.java 2017-02-02 18:55:08.000000000 +0100 @@ -66,8 +66,9 @@ public class Path extends DataType implements Cloneable, ResourceCollection { // CheckStyle:VisibilityModifier OFF - bc + // non-final as some IDE integrations (at least Eclipse) want to override it /** The system classpath as a Path object */ - public static final Path systemClasspath = + public static Path systemClasspath = //NOSONAR new Path(null, System.getProperty("java.class.path")); diff -Nru ant-1.9.8/src/script/ant ant-1.9.9/src/script/ant --- ant-1.9.8/src/script/ant 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/src/script/ant 2017-02-02 18:55:08.000000000 +0100 @@ -22,15 +22,17 @@ ant_exec_debug=false show_help=false -esc_tool=sed - -# if awk esc_tool is chosen, use nawk when available -if [ "$esc_tool" = "awk" ] +if [ -z "$PROTECT_NL" ] then - awk_exec=awk - # Solaris_awk does not support gsub, but Solaris_nawk does - # `command -v` behavior is part of posix spec - command -v nawk >/dev/null && awk_exec=nawk + PROTECT_NL=true + os=`uname -s` + rel=`uname -r` + # heirloom bourne-shell used by Solaris 10 is not POSIX + # it lacks features necessary to protect trailing NL from subshell trimming + if [ "$os" = SunOS -a "$rel" = "5.10" ] + then + PROTECT_NL=false + fi fi for arg in "$@" ; do @@ -48,42 +50,24 @@ show_help=true fi + if [ "$PROTECT_NL" = "true" ] ; then + # pad the value with X to protect trailing NLs from subshell output trimming + esc_arg="${arg}X" + else + esc_arg="${arg}" + fi + # wrap all arguments as "" strings, escape any internal back-slash, double-quote, $, or back-tick characters # use printf to avoid echo interpretation behaviors such as escapes and line continuation - # pad the value with X to protect leading/trailing whitespace from subshell output trimming - esc_arg="X${arg}X" - case "$esc_tool" in - 'sed') - # Mac bsd_sed does not support group-0, so pattern uses group-1 - # Solaris sed only proceses lines with trailing newline, passing in an extra newline - # subshell assignment will trim the added trailing newline - esc_arg="$(printf '%s\n' "$esc_arg" | sed -e 's@\([$"\\`]\)@\\\1@g')" - ;; - 'awk') - esc_arg="$(printf '%s' "$esc_arg" | "$awk_exec" '{ gsub(/\\/, "\\\\"); print }' )" - esc_arg="$(printf '%s' "$esc_arg" | "$awk_exec" '{ gsub(/\$/, "\\$"); print }' )" - esc_arg="$(printf '%s' "$esc_arg" | "$awk_exec" '{ gsub(/\"/, "\\\""); print }' )" - esc_arg="$(printf '%s' "$esc_arg" | "$awk_exec" '{ gsub(/`/, "\\`"); print }' )" - ;; -# 'bash') -# # does not depend upon `sed` or `echo` quirks -# # tested with bash `[ -n "${BASH_VERSION}" ]` -# # tested with zsh `[ -n "${ZSH_NAME}" ]` -# # tested with ksh93+ `ksh_ver="$(echo "$KSH_VERSION" | grep -m 1 -o '[0-9]\+' | head -n 1)"; [ "$ksh_ver" -gt 88 ]` -# # fails in ksh88, dash, ash -# esc_arg="${esc_arg//\\/\\\\}" # must be first since later patterns introduce backslash chars -# esc_arg="${esc_arg//\$/\\\$}" -# esc_arg="${esc_arg//\"/\\\"}" -# esc_arg="${esc_arg//\`/\\\`}" -# ;; - '*') - echo "could not determine escaping tool" - exit 1 - ;; - esac - # remove the padding Xs added above - esc_arg="${esc_arg#X}" - esc_arg="${esc_arg%X}" + # Mac bsd_sed does not support group-0, so pattern uses group-1 + # Solaris sed only processes lines with trailing newline, passing in an extra newline + # subshell (heirloom and posix) will trim the added trailing newline + esc_arg="`printf '%s\n' "$esc_arg" | sed -e 's@\([$\"\`\\]\)@\\\\\\1@g' `" + + if [ "$PROTECT_NL" = "true" ] ; then + # remove the padding X added above, this syntax is POSIX compatible but not heirloom-sh + esc_arg="${esc_arg%X}" + fi quoted_arg="\"$esc_arg\"" if $ant_exec_debug @@ -388,7 +372,8 @@ fi ant_exec_command="exec \"\$JAVACMD\" $ANT_OPTS -classpath \"\$LOCALCLASSPATH\" -Dant.home=\"\$ANT_HOME\" -Dant.library.dir=\"\$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"\$CLASSPATH\"" if $ant_exec_debug ; then - echo "$ant_exec_command $ant_exec_args" + # using printf to avoid echo line continuation and escape interpretation confusion + printf "%s\n" "$ant_exec_command $ant_exec_args" fi eval "$ant_exec_command $ant_exec_args" diff -Nru ant-1.9.8/WHATSNEW ant-1.9.9/WHATSNEW --- ant-1.9.8/WHATSNEW 2016-12-25 18:45:03.000000000 +0100 +++ ant-1.9.9/WHATSNEW 2017-02-02 18:55:08.000000000 +0100 @@ -1,3 +1,19 @@ +Changes from Ant 1.9.8 TO Ant 1.9.9 +=================================== + +Fixed bugs: +----------- + + * Ant 1.9.8 made Path#systemClasspath final which broke the Eclipse + integration. + Bugzilla Report 60582 + + * the wrapper script still didn't work on Solaris 10, but worked on + Solaris 11. + The "fixed" script should work in most cases but will not preserve + newlines present in command line arguments. + Bugzilla Report 60562 + Changes from Ant 1.9.7 TO Ant 1.9.8 ===================================
