WHATSNEW

+Changes from Ant 1.10.4 TO Ant 1.10.5
+=====================================
+
+Fixed bugs:
+-----------
+
+ * Fixes a regression in the "get" task where redirects
+   from a HTTP resource to a HTTPS resource started throwing
+   an exception.
+   Bugzilla Report 62499
+
+ * the new allowFilesToEscapeDest didn't work when set to false and
+   archive entries contained relative paths with so many ".."
+   segnments that the resulting path would go beyond the file system
+   root.
+   Bugzilla Report 62502
+
+Other changes:
+--------------
+ * Java task now accepts a "sourcefile" attribute to allow single file
+   source program execution, a feature that is introduced in Java 11.
+
 Changes from Ant 1.10.3 TO Ant 1.10.4
 =====================================
 

build.xml

@@ -33,10 +33,10 @@
   <property name="name" value="ant"/>
   <!-- this is the directory corresponding to groupId of Ant in the Maven repository -->
   <property name="groupid" value="org/apache/ant"/>
-  <property name="project.version" value="1.10.4"/>
+  <property name="project.version" value="1.10.5"/>
   <!-- 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.10.4"/>
-  <property name="manifest-version" value="1.10.4"/>
+  <property name="pom.version" value="1.10.5"/>
+  <property name="manifest-version" value="1.10.5"/>
   <property name="bootstrap.jar" value="ant-bootstrap.jar"/>
 
   <property name="ant.package" value="org/apache/tools/ant"/>

debian/changelog

+ant (1.10.5-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+  * Replaced debian/orig-tar.sh with the Files-Excluded mechanism
+  * Standards-Version updated to 4.1.5
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 16 Jul 2018 15:14:01 +0200
+
 ant (1.10.4-2) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -25,7 +25,7 @@ Build-Depends: antlr,
                libxml-commons-resolver1.1-java (>= 1.2-7~),
                libxz-java,
                maven-repo-helper (>> 1.0)
-Standards-Version: 4.1.4
+Standards-Version: 4.1.5
 Vcs-Git: https://salsa.debian.org/java-team/ant.git
 Vcs-Browser: https://salsa.debian.org/java-team/ant
 Homepage: http://ant.apache.org

debian/copyright

 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Apache Ant
 Source: http://ant.apache.org
+Files-Excluded: *.jar
 
 Files: *
 Copyright: 2000-2018, The Apache Software Foundation

debian/orig-tar.sh

-#!/bin/sh -e
-
-VERSION=$2
-ORIG_TAR=$3
-TAR=../ant_$VERSION.orig.tar.xz
-DIR=apache-ant-$VERSION
-
-tar xvzf $ORIG_TAR
-rm $ORIG_TAR
-XZ_OPT=--best tar -c -J -f $TAR --exclude '*.jar' --exclude '*.pdf' $DIR
-rm -rf $DIR
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $TAR $origDir
-  echo "moved $TAR to $origDir"
-fi
-

debian/watch

-version=2
-https://www.apache.org/dist/ant/source/apache-ant-(.*)-src\.tar\.gz debian debian/orig-tar.sh
+version=4
+opts="repack,compression=xz" \
+https://www.apache.org/dist/ant/source/apache-ant-(.*)-src\.tar\.gz

lib/libraries.properties

@@ -31,7 +31,7 @@ m2.repo=http://repo1.maven.org/maven2/
 # Versions of different libraries. Please keep in alphabetical order, except
 # when a specific dependency forces them to be out-of-order
 ivy.version=2.4.0
-ant-antunit.version=1.3
+ant-antunit.version=1.4
 antlr.version=2.7.7
 bcel.version=6.2
 bsf.version=2.4.0

manual/Tasks/java.html

@@ -50,7 +50,7 @@ because it tries to read from the standard input.</p>
   <tr id="classname">
     <td>classname</td>
     <td>the Java class to execute.</td>
-    <td rowspan="3">Exactly one of the three</td>
+    <td rowspan="4">Exactly one of the four</td>
   </tr>
   <tr>
     <td>jar</td>
@@ -65,6 +65,13 @@ because it tries to read from the standard input.</p>
       entry in the manifest).  <var>fork</var> must be set to <q>true</q> if this option is
       selected. <em>since Ant 1.9.7</em></td>
   </tr>
+  <tr>
+    <td>sourcefile</td>
+    <td class="left">The location of a ".java" file or a file containing shebang with Java source code.
+      Set this attribute to run Java single file source programs, a feature introduced in Java 11.
+      <var>fork</var> must be set to <q>true</q> if this option is selected.
+      <em>since Ant 1.10.5</em></td>
+  </tr>
   <tr>
     <td>args</td>
     <td>the arguments for the class that is executed. <em><u>Deprecated</u>, use

manual/Tasks/mimemail.html

@@ -31,10 +31,14 @@
 
 <h3>Description</h3>
 <p>Sends SMTP mail with MIME
-attachments.  <a href="https://www.oracle.com/technetwork/java/index-138643.html"
+attachments.  <a href="https://javaee.github.io/javamail/"
 target="_top">JavaMail</a>
-and <a href="https://www.oracle.com/technetwork/java/javase/jaf-135115.html" target="_top">Java
-Activation Framework</a> are required for this task.</p>
+and <a href="https://github.com/javaee/activation" target="_top">Java
+Activation Framework</a> are required for this task. The Java
+Activation Framework is part of the standard class library for Java 6
+to Java 10 but the <code>java.activation</code> module has been
+deprecated in Java 9 and must be enabled explicitly when running on
+Java 10. Alternatively it can be provided as an external library.</p>
 <p>Multiple files can be attached using <a href="../Types/fileset.html">FileSets.</a></p>
 <h3>Parameters</h3>
 <table class="attr">

manual/cover.html

@@ -19,13 +19,13 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>Apache Ant 1.10.4 User Manual</title>
+<title>Apache Ant 1.10.5 User Manual</title>
 </head>
 
 <body>
   <h1 class="center"><img src="images/ant_logo_large.gif" width="190" height="120" alt="Apache Ant logo"></h1>
-  <h1 class="center">Apache Ant&trade; 1.10.4 Manual</h1>
-  <p>This is the manual for version 1.10.4 of <a href="https://ant.apache.org/" target="_top">Apache Ant</a>. If your
+  <h1 class="center">Apache Ant&trade; 1.10.5 Manual</h1>
+  <p>This is the manual for version 1.10.5 of <a href="https://ant.apache.org/" target="_top">Apache Ant</a>. If your
     version of Ant (as verified with <kbd>ant -version</kbd>) is older or newer than this version then this is not the
     correct manual set. Please use the documentation appropriate to your current version. Also, if you are using a
     version older than the most recent release, we recommend an upgrade to fix bugs as well as provide new

manual/credits.html

@@ -19,7 +19,7 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>Apache Ant User Manual&mdash;Credits</title>
+<title>Apache Ant User Manual - Credits</title>
 </head>
 
 <body>
@@ -46,7 +46,7 @@
   <li>Arnout J. Kuiper (<a href="mailto:ajkuiper@wxs.nl">ajkuiper@wxs.nl</a>)</li>
   <li>Antoine L&eacute;vy-Lambert</li>
   <li>Conor MacNeill</li>
-  <li>Jan Mat&eacute;rne</li>
+  <li>Jan Mat&egrave;rne</li>
   <li>Stefano Mazzocchi (<a href="mailto:stefano@apache.org">stefano@apache.org</a>)</li>
   <li>Erik Meade (<a href="mailto:emeade@geekfarm.org">emeade@geekfarm.org</a>)</li>
   <li>Sam Ruby (<a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>)</li>
@@ -61,7 +61,7 @@
   <li>Craeg Strong (<a href="mailto:cstrong@arielpartners.com">cstrong@arielpartners.com</a>)</li>
 </ul>
 
-<p class="center">Version: 1.10.4</p>
+<p class="center">Version: 1.10.5</p>
 
 </body>
 </html>

manual/install.html

@@ -897,10 +897,14 @@ these tasks available. Please refer to the <a href="#optionalTasks">Installing A
     <td><a href="https://javaee.github.io/javamail/" target="_top">https://javaee.github.io/javamail/</a></td>
   </tr>
   <tr>
-    <td>activation.jar<br/>(included in Java 6 and later runtime)</td>
+    <td>activation.jar<br/>
+    (included in Java 6 to Java 10 but
+    the <code>java.activation</code> module is deprecated and marked
+    for removal in Java 9 and needs to be enabled explicitly on Java
+    10)</td>
     <td><a href="Tasks/mail.html">mail</a> task with MIME encoding,
       and <em><u>deprecated</u></em> <a href="Tasks/mimemail.html">mimemail</a> task</td>
-    <td><a href="https://www.oracle.com/technetwork/java/javase/jaf-135115.html"
+    <td><a href="https://github.com/javaee/activation"
            target="_top">https://www.oracle.com/technetwork/java/javase/jaf-135115.html</a></td>
   </tr>
   <tr>

src/etc/jdepend.xsl

@@ -89,7 +89,7 @@
     </ul-->
     
     <h1><a name="top">JDepend Analysis</a></h1>
-    <p align="right">Designed for use with <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="http://jakarta.apache.org">Ant</a>.</p>
+    <p align="right">Designed for use with <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> and <a href="https://ant.apache.org">Ant</a>.</p>
     <hr size="2" />
     
     <table width="100%"><tr><td>

src/etc/poms/ant-antlr/pom.xml

@@ -27,13 +27,13 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.4</version>
+    <version>1.10.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-antlr</artifactId>
-  <version>1.10.4</version>
+  <version>1.10.5</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.10.4</version>
+      <version>1.10.5</version>
       <optional>true</optional>
       <scope>compile</scope>
     </dependency>

src/etc/poms/ant-apache-bcel/pom.xml

@@ -27,19 +27,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.4</version>
+    <version>1.10.5</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.10.4</version>
+  <version>1.10.5</version>
   <name>Apache Ant + BCEL</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.4</version>
+      <version>1.10.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

src/etc/poms/ant-apache-bsf/pom.xml

@@ -27,19 +27,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.4</version>
+    <version>1.10.5</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.10.4</version>
+  <version>1.10.5</version>
   <name>Apache Ant + BSF</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.4</version>
+      <version>1.10.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

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
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.4</version>
+    <version>1.10.5</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.10.4</version>
+  <version>1.10.5</version>
   <name>Apache Ant + Log4J</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.4</version>
+      <version>1.10.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

src/etc/poms/ant-apache-oro/pom.xml

@@ -27,19 +27,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.4</version>
+    <version>1.10.5</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.10.4</version>
+  <version>1.10.5</version>
   <name>Apache Ant + Apache Oro</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.4</version>
+      <version>1.10.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

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
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.4</version>
+    <version>1.10.5</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.10.4</version>
+  <version>1.10.5</version>
   <name>Apache Ant + Apache Regexp</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.4</version>
+      <version>1.10.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>