You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2016/04/12 19:58:58 UTC

svn commit: r1738839 - in /ant/site/ant: production/ production/manual/ production/manual/Tasks/ sources/

Author: bodewig
Date: Tue Apr 12 17:58:57 2016
New Revision: 1738839

URL: http://svn.apache.org/viewvc?rev=1738839&view=rev
Log:
prepare site for 1.9.7

Modified:
    ant/site/ant/production/antnews.html
    ant/site/ant/production/bindownload.html
    ant/site/ant/production/faq.html
    ant/site/ant/production/index.html
    ant/site/ant/production/manual/Tasks/apply.html
    ant/site/ant/production/manual/Tasks/conditions.html
    ant/site/ant/production/manual/Tasks/exec.html
    ant/site/ant/production/manual/Tasks/jar.html
    ant/site/ant/production/manual/Tasks/java.html
    ant/site/ant/production/manual/Tasks/javac.html
    ant/site/ant/production/manual/Tasks/scp.html
    ant/site/ant/production/manual/Tasks/sshexec.html
    ant/site/ant/production/manual/Tasks/style.html
    ant/site/ant/production/manual/cover.html
    ant/site/ant/production/manual/credits.html
    ant/site/ant/production/manual/properties.html
    ant/site/ant/production/manualdownload.html
    ant/site/ant/production/srcdownload.html
    ant/site/ant/sources/antnews.xml
    ant/site/ant/sources/bindownload.xml
    ant/site/ant/sources/faq.xml
    ant/site/ant/sources/index.xml
    ant/site/ant/sources/manualdownload.xml
    ant/site/ant/sources/srcdownload.xml

Modified: ant/site/ant/production/antnews.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/antnews.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/antnews.html (original)
+++ ant/site/ant/production/antnews.html Tue Apr 12 17:58:57 2016
@@ -214,6 +214,15 @@
   <div class="content">
     <h1 class="title">Apache Ant&#x2122; Project News</h1>
             <h3 class="section">
+      <a name="Apache Ant 1.9.7"></a>
+      Apache Ant 1.9.7
+    </h3>
+                        <h3>Apr 12, 2016 - Apache Ant 1.9.7 Released</h3>
+                                <p>Apache Ant 1.9.7 is now available for download as source or
+      binary from
+      <a href="http://ant.apache.org/bindownload.cgi">http://ant.apache.org/bindownload.cgi</a>.</p>
+                                <p>Ant 1.9.7 contains several bug fixes and improvements compared to Ant 1.9.6.</p>
+                        <h3 class="section">
       <a name="Apache Ant 1.9.6"></a>
       Apache Ant 1.9.6
     </h3>

Modified: ant/site/ant/production/bindownload.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/bindownload.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/bindownload.html (original)
+++ ant/site/ant/production/bindownload.html Tue Apr 12 17:58:57 2016
@@ -259,11 +259,11 @@ Other mirrors: <select name="Preferred">
       <a name="Current Release of Ant"></a>
       Current Release of Ant
     </h3>
-                        <p>Currently, Apache Ant 1.9.6 is the best available version, see the
+                        <p>Currently, Apache Ant 1.9.7 is the best available version, see the
 <a href="[preferred]/ant/README.html">release notes</a>.</p>
                                 <div class="warning">
 <div class="label">Note</div>
-<div class="content">Ant 1.9.6 was released on 02-Jul-2015 and
+<div class="content">Ant 1.9.7 was released on 12-Apr-2016 and
 may not be available on all mirrors for a few days.</div>
 </div>
                                 <br />
@@ -274,25 +274,25 @@ may not be available on all mirrors for
 </div>
                                 <ul>
 <li><code>.zip</code> archive:
-<a href="[preferred]/ant/binaries/apache-ant-1.9.6-bin.zip">apache-ant-1.9.6-bin.zip</a>
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.zip.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.zip.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.zip.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.zip.md5">MD5</a>]</li>
+<a href="[preferred]/ant/binaries/apache-ant-1.9.7-bin.zip">apache-ant-1.9.7-bin.zip</a>
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.zip.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.zip.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.zip.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.zip.md5">MD5</a>]</li>
 
 <li><code>.tar.gz</code> archive:
-<a href="[preferred]/ant/binaries/apache-ant-1.9.6-bin.tar.gz">apache-ant-1.9.6-bin.tar.gz</a>
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.tar.gz.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.tar.gz.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.tar.gz.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.tar.gz.md5">MD5</a>]</li>
+<a href="[preferred]/ant/binaries/apache-ant-1.9.7-bin.tar.gz">apache-ant-1.9.7-bin.tar.gz</a>
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.gz.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.gz.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.gz.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.gz.md5">MD5</a>]</li>
 
 <li><code>.tar.bz2</code> archive:
-<a href="[preferred]/ant/binaries/apache-ant-1.9.6-bin.tar.bz2">apache-ant-1.9.6-bin.tar.bz2</a>
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.tar.bz2.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.tar.bz2.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.tar.bz2.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.tar.bz2.md5">MD5</a>]</li>
+<a href="[preferred]/ant/binaries/apache-ant-1.9.7-bin.tar.bz2">apache-ant-1.9.7-bin.tar.bz2</a>
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.bz2.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.bz2.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.bz2.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.bz2.md5">MD5</a>]</li>
 </ul>
                         <h3 class="section">
       <a name="Old Ant Releases"></a>
@@ -315,17 +315,17 @@ directory</a>, rather than from a mirror
 using</p>
                                 <p><code>
 % pgpk -a KEYS<br />
-% pgpv apache-ant-1.9.6-bin.tar.gz.asc<br />
+% pgpv apache-ant-1.9.7-bin.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % pgp -ka KEYS<br />
-% pgp apache-ant-1.9.6-bin.tar.gz.asc<br />
+% pgp apache-ant-1.9.7-bin.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % gpg --import KEYS<br />
-% gpg --verify apache-ant-1.9.6-bin.tar.gz.asc
+% gpg --verify apache-ant-1.9.7-bin.tar.gz.asc
 </code></p>
                                 <p>A command line version of <a href="http://www.gnupg.org/download/">GnuPG</a> 
 is also available for Windows users.  Follow the 

Modified: ant/site/ant/production/faq.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/faq.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/faq.html (original)
+++ ant/site/ant/production/faq.html Tue Apr 12 17:58:57 2016
@@ -847,6 +847,16 @@
           02 Jul 2015
       </td>
       </tr>
+                  <tr>
+                      <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          1.9.7
+      </td>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          12 Apr 2016
+      </td>
+      </tr>
           </table>
                                 <p class="faq">
       <a name="java-version"></a>

Modified: ant/site/ant/production/index.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/index.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/index.html (original)
+++ ant/site/ant/production/index.html Tue Apr 12 17:58:57 2016
@@ -252,15 +252,14 @@
     history that shows which version of Ant can be used with which
     version of Java.</p>
                         <h3 class="section">
-      <a name="Apache Ant 1.9.6"></a>
-      Apache Ant 1.9.6
+      <a name="Apache Ant 1.9.7"></a>
+      Apache Ant 1.9.7
     </h3>
-                        <h3>Jul 2, 2015 - Apache Ant 1.9.6 Released</h3>
-                                <p>Apache Ant 1.9.6 is now available for download as source or
+                        <h3>Apr 12, 2016 - Apache Ant 1.9.7 Released</h3>
+                                <p>Apache Ant 1.9.7 is now available for download as source or
       binary from
       <a href="http://ant.apache.org/bindownload.cgi">http://ant.apache.org/bindownload.cgi</a>.</p>
-                                <p>Ant 1.9.6 fixes a regression in the zip package introduced with
-    Ant 1.9.5.</p>
+                                <p>Ant 1.9.7 contains several bug fixes and improvements compared to Ant 1.9.6.</p>
                         <h3 class="section">
       <a name="Apache IvyDE 2.2.0"></a>
       Apache IvyDE 2.2.0
@@ -341,7 +340,7 @@
       Documentation
     </h3>
                         <p>
-You can view the documentation for the current release (Apache Ant 1.9.6)
+You can view the documentation for the current release (Apache Ant 1.9.7)
 <a href="manual/index.html">online</a>
 </p>
                                 <p>

Modified: ant/site/ant/production/manual/Tasks/apply.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/apply.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/apply.html (original)
+++ ant/site/ant/production/manual/Tasks/apply.html Tue Apr 12 17:58:57 2016
@@ -95,7 +95,12 @@ to send input to it is via the input and
   <tr>
     <td valign="top">dir</td>
     <td valign="top">the directory in which the command should be executed.</td>
-    <td align="center" valign="top">No</td>
+    <td align="center" valign="top">No.<br/>
+      <strong>Note:</strong> the default used when dir has not been
+      specified depends on the <code>vmlauncher</code> attribute.  If
+      <code>vmlauncher</code> is <code>true</code> the task will use
+      the current working directory, otherwise it uses the project's basedir.
+    </td>
   </tr>
   <tr>
     <td valign="top">relative</td>

Modified: ant/site/ant/production/manual/Tasks/conditions.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/conditions.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/conditions.html (original)
+++ ant/site/ant/production/manual/Tasks/conditions.html Tue Apr 12 17:58:57 2016
@@ -229,6 +229,13 @@ of 400 or greater are viewed as invalid.
       <em>since Ant 1.8.0</em></td>
     <td align="center">No</td>
   </tr>
+  <tr>
+    <td valign="top">followRedirects</td>
+    <td valign="top">Whether redirects should be followed. The default
+      is <code>true</code><br/>
+      <em>since Ant 1.9.7</em></td>
+    <td align="center">No</td>
+  </tr>
 </table>
 
 <h4><a name="socket">socket</a></h4>

Modified: ant/site/ant/production/manual/Tasks/exec.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/exec.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/exec.html (original)
+++ ant/site/ant/production/manual/Tasks/exec.html Tue Apr 12 17:58:57 2016
@@ -171,7 +171,12 @@ or the task will fail as follows:
   <tr>
     <td valign="top">dir</td>
     <td valign="top">the directory in which the command should be executed.</td>
-    <td align="center" valign="top">No</td>
+    <td align="center" valign="top">No.<br/>
+      <strong>Note:</strong> the default used when dir has not been
+      specified depends on the <code>vmlauncher</code> attribute.  If
+      <code>vmlauncher</code> is <code>true</code> the task will use
+      the current working directory, otherwise it uses the project's basedir.
+    </td>
   </tr>
   <tr>
     <td valign="top">os</td>

Modified: ant/site/ant/production/manual/Tasks/jar.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/jar.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/jar.html (original)
+++ ant/site/ant/production/manual/Tasks/jar.html Tue Apr 12 17:58:57 2016
@@ -559,7 +559,7 @@ Sealed: false</code></pre></blockquote>
   The following shows how to create a jar file specifying a service
   with an implementation of the JDK6 scripting interface:
 </p>
-<blockquote><pre>&lt;jar jarfile="pinky.jar"&gt;
+<blockquote><pre>&lt;jar destfile="pinky.jar"&gt;
   &lt;fileset dir="build/classes"/&gt;
   &lt;service type="javax.script.ScriptEngineFactory"
            provider="org.acme.PinkyLanguage"/&gt;
@@ -573,7 +573,7 @@ Sealed: false</code></pre></blockquote>
   with two implementations of the JDK6 scripting interface:
 </p>
 <blockquote><pre>
-&lt;jar jarfile="pinkyandbrain.jar"&gt;
+&lt;jar destfile="pinkyandbrain.jar"&gt;
   &lt;fileset dir="classes"/&gt;
   &lt;service type="javax.script.ScriptEngineFactory"&gt;
     &lt;provider classname="org.acme.PinkyLanguage"/&gt;

Modified: ant/site/ant/production/manual/Tasks/java.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/java.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/java.html (original)
+++ ant/site/ant/production/manual/Tasks/java.html Tue Apr 12 17:58:57 2016
@@ -54,9 +54,9 @@ attributes.</p>
     <td align="center" valign="top"><b>Required</b></td>
   </tr>
   <tr>
-    <td valign="top">classname</td>
+    <td valign="top"><a name="classname">classname</a></td>
     <td valign="top">the Java class to execute.</td>
-    <td align="center" valign="top">Either <tt>jar</tt> or <tt>classname</tt></td>
+    <td align="center" valign="top">Either <tt>jar</tt>, <tt>classname</tt> or <tt>module</tt></td>
   </tr>
   <tr>
     <td valign="top">jar</td>
@@ -64,7 +64,7 @@ attributes.</p>
     Main-Class entry in the manifest). Fork must be set to true if this option is selected.
     See notes below for more details.
     </td>
-    <td align="center" valign="top">Either <tt>jar</tt> or <tt>classname</tt></td>
+    <td align="center" valign="top">Either <tt>jar</tt>, <tt>classname</tt> or <tt>module</tt></td>
   </tr>
   <tr>
     <td valign="top">args</td>
@@ -120,6 +120,25 @@ attributes.</p>
     <td align="center" valign="top">No</td>
   </tr>
   <tr>
+    <td valign="top">module</td>
+    <td valign="top">The initial or main module to resolve. To specify
+    the module main class use the <a href="#classname">classname</a> attribute.
+    Fork must be set to true if this option is selected.<em>since Ant 1.9.7</em></td>
+    <td align="center" valign="top">Either <tt>jar</tt>, <tt>classname</tt> or <tt>module</tt></td>
+  </tr>
+  <tr>
+    <td valign="top">modulepath</td>
+    <td valign="top">Specify where to find application modules. A list of directories of modules, module files or exploded modules.<em>since Ant 1.9.7</em></td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">modulepathref</td>
+    <td valign="top">The modulepath to use, given as <a
+      href="../using.html#references">reference</a> to a PATH defined elsewhere.
+      <em>since Ant 1.9.7</em></td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
     <td valign="top">failonerror</td>
     <td valign="top">Stop the buildprocess if the command exits with a
       returncode other than 0. Default is "false" (see <a href="#failonerror">note</a>)</td>
@@ -312,6 +331,18 @@ error and would mean the build exits.
 , then <code>&lt;java&gt;</code> <b>must</b> return 0 otherwise the build will
 exit, as the class was run by the build JVM.</p>
 
+<a name="modulepath"><h4>modulepath</h4>
+<i><b>Since Ant 1.9.7</b></i>
+<p><code>Java</code>'s <i>modulepath</i> attribute is a <a
+href="../using.html#path">PATH like structure</a> and can also be set via a nested
+<i>modulepath</i> element.</p>
+
+<a name="upgrademodulepath"><h4>upgrademodulepath</h4>
+<i><b>Since Ant 1.9.7</b></i>
+<p>The location of modules that replace upgradeable modules in the runtime image
+can be specified using this <a href="../using.html#path">PATH like structure</a>.</p>
+
+
 <h3>JAR file execution</h3>
 
 <p>The parameter of the <tt>jar</tt> attribute is of type <tt>File</tt>;
@@ -400,6 +431,31 @@ log-prefix to <code>[java1.4]</code>.
 JVM, as it takes different parameters for other JVMs,
 That JVM can be started from <code>&lt;exec&gt;</code> if required.</p>
 
+<pre>
+       &lt;java
+           fork=&quot;true&quot;
+           failonerror=&quot;true&quot;
+           maxmemory=&quot;128m&quot;
+           module=&quot;TestModule&quot;
+           modulepath=&quot;lib:dist/test.jar&quot;/&gt;
+</pre>
+Runs the module TestModule resolved on the modulepath <tt>lib/:dist/test.jar</tt>
+with a maximum memory of 128MB. Any non zero return code breaks the build.
 
+<pre>
+       &lt;java
+           fork=&quot;true&quot;
+           failonerror=&quot;true&quot;
+           maxmemory=&quot;128m&quot;
+           module=&quot;TestModule&quot;
+           classname=&quot;Main&quot;&gt;
+         &lt;modulepath&gt;
+           &lt;pathelement location=&quot;lib&quot;/&gt;
+           &lt;pathelement location=&quot;dist/test.jar&quot;/&gt;
+         &lt;/modulepath&gt;
+       &lt;/java&gt;
+</pre>
+Runs the class Main in module TestModule resolved on the modulepath <tt>lib/:dist/test.jar</tt>
+with a maximum memory of 128MB. Any non zero return code breaks the build.
 </body>
 </html>

Modified: ant/site/ant/production/manual/Tasks/javac.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/javac.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/javac.html (original)
+++ ant/site/ant/production/manual/Tasks/javac.html Tue Apr 12 17:58:57 2016
@@ -135,7 +135,7 @@ invoking the compiler.</p>
     <td valign="top">srcdir</td>
     <td valign="top">Location of the java files. (See the
      <a href="#srcdirnote">note</a> below.)</td>
-    <td align="center" valign="top">Yes, unless nested <code>&lt;src&gt;</code> elements are present.</td>
+    <td align="center" valign="top">Yes, unless nested <code>&lt;src&gt;</code> elements or <code>modulesourcepath</code> attribute or elements are present.</td>
   </tr>
   <tr>
     <td valign="top">destdir</td>
@@ -459,6 +459,51 @@ invoking the compiler.</p>
     </td>
     <td align="center" valign="top">No - default is "true"</td>
   </tr>
+  <tr>
+    <td valign="top">modulepath</td>
+    <td valign="top">
+      Specify where to find application modules. A list of directories of modules, module files or exploded modules.
+      <em>since Ant 1.9.7</em>
+    </td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">modulepathref</td>
+    <td valign="top">
+      The modulepath to use, given as <a href="../using.html#references">reference</a> to a PATH defined elsewhere.
+      <em>since Ant 1.9.7</em></td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">modulesourcepath</td>
+    <td valign="top">
+      Specify where to find input source files for multiple module compilation.
+      <em>since Ant 1.9.7</em>
+    </td>
+    <td align="center" valign="top">Yes, unless <code>srcdir</code> attribute or nested <code>&lt;src&gt;</code> elements are present</td>
+  </tr>
+  <tr>
+    <td valign="top">modulesourcepathref</td>
+    <td valign="top">
+      The modulesourcepath to use, given as <a href="../using.html#references">reference</a> to a PATH defined elsewhere.
+      <em>since Ant 1.9.7</em></td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">upgrademodulepath</td>
+    <td valign="top">
+      Specify the location of modules that replace upgradeable modules in the runtime image.
+      <em>since Ant 1.9.7</em>
+    </td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">upgrademodulepathref</td>
+    <td valign="top">
+      The upgrademodulepath to use, given as <a href="../using.html#references">reference</a> to a PATH defined elsewhere.
+      <em>since Ant 1.9.7</em></td>
+    <td align="center" valign="top">No</td>
+  </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
@@ -468,17 +513,23 @@ supports most attributes of <code>&lt;fi
 <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
 <code>&lt;patternset&gt;</code> elements.</p>
 <h4><code>srcdir</code>, <code>classpath</code>, <code>sourcepath</code>,
-<code>bootclasspath</code> and <code>extdirs</code></h4>
+<code>bootclasspath</code>, <code>modulepath</code>, <code>modulesourcepath</code>,
+<code>upgrademodulepath</code> and <code>extdirs</code></h4>
 <p><code>&lt;javac&gt;</code>'s <code>srcdir</code>, <code>classpath</code>,
-<code>sourcepath</code>, <code>bootclasspath</code>, and
-<code>extdirs</code> attributes are
+<code>sourcepath</code>, <code>bootclasspath</code>,
+<code>extdirs</code>, <code>modulepath</code>, <code>modulesourcepath</code>,
+and <code>upgrademodulepath</code> attributes are
 <a href="../using.html#path">path-like structures</a>
 and can also be set via nested
 <code>&lt;src&gt;</code> (note the different name!),
 <code>&lt;classpath&gt;</code>,
 <code>&lt;sourcepath&gt;</code>,
-<code>&lt;bootclasspath&gt;</code> and
-<code>&lt;extdirs&gt;</code> elements, respectively.</p>
+<code>&lt;bootclasspath&gt;</code>,
+<code>&lt;extdirs&gt;</code>,
+<code>&lt;modulepath&gt;</code>,
+<code>&lt;modulesourcepath&gt;</code> and
+<code>&lt;upgrademodulepath&gt;</code>
+elements, respectively.</p>
 
 <h4>compilerarg</h4>
 
@@ -710,6 +761,31 @@ the <tt>&lt;compilerarg&gt;</tt> element
 <p>in which case your compiler adapter can support attributes and
   nested elements of its own.</p>
 
+<pre>  &lt;javac srcdir=&quot;${src}&quot;
+         destdir=&quot;${build}&quot;
+         includeantruntime=&quot;false&quot;
+         modulepath=&quot;modules&quot;
+         source=&quot;9&quot;
+  /&gt;</pre>
+<p>compiles all <code>.java</code> files in a single module under the <code>${src}</code> directory,
+  and stores the <code>.class</code> files in the <code>${build}</code> directory. The compilation uses
+  application modules located in <code>modules</code> folder.The source level is <code>9</code> to enable modules.</p>
+
+<pre>  &lt;javac modulesourcepath=&quot;${src}/*/{gen,lin{32,64}}/classes&quot;
+         destdir=&quot;${build}&quot;
+         includeantruntime=&quot;false&quot;
+         modulepath=&quot;modules&quot;
+         source=&quot;9&quot;
+  /&gt;</pre>
+<p>compiles all <code>.java</code> files in <code>gen/classes</code>, <code>lin32/classes</code> and
+  <code>lin64/classes</code> in all source modules under the <code>${src}</code> directory.
+  Generates module directories in the <code>${build}</code> directory. Each generated module directory under
+  the <code>${build}</code> directory contains <code>.class</code> files from corresponding source module.
+  The <code>*</code> is a token representing the name of any of the modules in the compilation module set.
+  The <code>{ ... , ... }</code> express alternates for expansion.
+  The compilation uses application modules located in <code>modules</code> folder.The source level is
+  <code>9</code> to enable modules.</p>
+
 <h3>Jikes Notes</h3>
 
 <p>You need Jikes 1.15 or later.</p>

Modified: ant/site/ant/production/manual/Tasks/scp.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/scp.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/scp.html (original)
+++ ant/site/ant/production/manual/Tasks/scp.html Tue Apr 12 17:58:57 2016
@@ -200,13 +200,31 @@ for more information.  This task has bee
       remote server. Default is 755. <em>since Ant 1.9.5</em>.</td>
     <td align="center" valign="top">No</td>
   </tr>
+  <tr>
+    <td valign="top">serverAliveIntervalSeconds</td>
+    <td valign="top">Sets a timeout interval in seconds after which if no data has
+      been received from the server, the task will send a message through
+      the encrypted channel to request a response from the server.
+      <em>since Ant 1.9.7</em></td>
+    <td align="center" valign="top">No, the default is 0, indicating
+      that these messages will not be sent to the server</td>
+  </tr>
+  <tr>
+    <td valign="top">serverAliveCountMax</td>
+    <td valign="top">The number of server alive messages which may be
+      sent without receiving any messages back from the server. Only
+      used if serverAliveIntervalSeconds is not 0.
+      <em>since Ant 1.9.7</em></td>
+    <td align="center" valign="top">No, defaults to 3</td>
+  </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
-<h4>fileset</h4>
- <p><a href="../Types/fileset.html">FileSet</a>s are used to select
-sets of files to copy.
- To use a fileset, the <code>todir</code> attribute must be set.</p>
+<h4>fileset or resource collections</h4>
+ <p><a href="../Types/fileset.html">FileSet</a>s or <a href="../Types/resources.html#collection">Resource Collection</a>s are used to select
+ groups of files to copy. To use a fileset or a resource collection, the <code>todir</code> attribute must be set.</p>
+
+Prior to Ant 1.9.7 only &lt;fileset&gt; has been supported as a nested element.
 
 <h3>Examples</h3>
 <p><b>Copy a single local file to a remote machine</b></p>
@@ -253,9 +271,18 @@ authentication.</b></p>
       &lt;include name=&quot;**/*.java&quot;/&gt;
     &lt;/fileset&gt;
   &lt;/scp&gt;
-
+</pre>
+<p><b>Copy a set of files to a remote directory in reverse last-modified order</b></p>
+<pre>
   &lt;scp todir=&quot;user:password@somehost:/home/chuck&quot;&gt;
-    &lt;fileset dir=&quot;src_dir&quot; excludes=&quot;**/*.java&quot;/&gt;
+    &lt;sort&gt;
+      &lt;reverse&gt;
+        &lt;date /&gt;
+      &lt;/reverse&gt;
+      &lt;fileset dir=&quot;src_dir&quot;&gt;
+        &lt;include name=&quot;**/*&quot; /&gt;
+      &lt;/fileset&gt;
+    &lt;/sort&gt;
   &lt;/scp&gt;
 </pre>
 

Modified: ant/site/ant/production/manual/Tasks/sshexec.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/sshexec.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/sshexec.html (original)
+++ ant/site/ant/production/manual/Tasks/sshexec.html Tue Apr 12 17:58:57 2016
@@ -230,6 +230,23 @@ and won't work with versions of jsch ear
       <em>since Ant 1.9.4</em></td>
     <td align="center" valign="top">No, defaults to false</td>
   </tr>
+  <tr>
+    <td valign="top">serverAliveIntervalSeconds</td>
+    <td valign="top">Sets a timeout interval in seconds after which if no data has
+      been received from the server, the task will send a message through
+      the encrypted channel to request a response from the server.
+      <em>since Ant 1.9.7</em></td>
+    <td align="center" valign="top">No, the default is 0, indicating
+      that these messages will not be sent to the server</td>
+  </tr>
+  <tr>
+    <td valign="top">serverAliveCountMax</td>
+    <td valign="top">The number of server alive messages which may be
+      sent without receiving any messages back from the server. Only
+      used if serverAliveIntervalSeconds is not 0.
+      <em>since Ant 1.9.7</em></td>
+    <td align="center" valign="top">No, defaults to 3</td>
+  </tr>
 </table>
 
 <h3>Examples</h3>

Modified: ant/site/ant/production/manual/Tasks/style.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/style.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/style.html (original)
+++ ant/site/ant/production/manual/Tasks/style.html Tue Apr 12 17:58:57 2016
@@ -92,7 +92,8 @@ element which is used to perform Entity
     <td valign="top">extension</td>
     <td valign="top">desired file extension to be used for the targets. If not
       specified, the default is &quot;.html&quot;.  Will be ignored if
-      a nested <code>&lt;mapper&gt;</code> has been specified.</td>
+      a nested <code>&lt;mapper&gt;</code> or both <code>in</code> and
+      <code>out</code> have been specified.</td>
     <td align="center" valign="top">No</td>
   </tr>
   <tr>

Modified: ant/site/ant/production/manual/cover.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/cover.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/manual/cover.html (original)
+++ ant/site/ant/production/manual/cover.html Tue Apr 12 17:58:57 2016
@@ -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.6 User Manual</title>
+<title>Apache Ant 1.9.7 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&trade; 1.9.6 Manual</h1>
-  <p align="left">This is the manual for version 1.9.6 of
+  <h1>Apache Ant&trade; 1.9.7 Manual</h1>
+  <p align="left">This is the manual for version 1.9.7 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 

Modified: ant/site/ant/production/manual/credits.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/credits.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/manual/credits.html (original)
+++ ant/site/ant/production/manual/credits.html Tue Apr 12 17:58:57 2016
@@ -62,7 +62,7 @@
 </ul>
 
 <center>
-<p>Version: 1.9.6</p>
+<p>Version: 1.9.7</p>
 </center>
 
 

Modified: ant/site/ant/production/manual/properties.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/properties.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/manual/properties.html (original)
+++ ant/site/ant/production/manual/properties.html Tue Apr 12 17:58:57 2016
@@ -77,13 +77,18 @@ ant.project.invoked-targets
                     been specified on the command line (the IDE,
                     an &lt;ant&gt; task ...) when invoking the current
                     project.
-                    This property is set when the first target is executed.
-                    So you can't use it in the implicit target (directly
-                    under the &lt;project&gt; tag).
+                    This property is set properly when the first target is executed.
+                    If you use it in the implicit target (directly
+                    under the &lt;project&gt; tag) the list will be
+                    empty if no target has been specified while it
+                    will contain the project's default target in this
+                    case for tasks nested into targets..
 ant.java.version    the JVM version Ant detected; currently it can hold
-                    the values &quot;1.7&quot;, &quot;1.6&quot;, &quot;1.5&quot;,
-                    &quot;1.4&quot;,  &quot;1.3&quot; and &quot;1.2&quot;.
-ant.core.lib        the absolute path of the <code>ant.jar</code> file.
+                    the values &quot;1.9&quot;, &quot;1.8&quot;,
+                    &quot;1.7&quot;, &quot;1.6&quot;, &quot;1.5&quot;,
+                    &quot;1.4&quot;, &quot;1.3&quot; and
+                    &quot;1.2&quot;.  ant.core.lib the absolute path
+                    of the <code>ant.jar</code> file.
 </pre>
 
   <p>There is also another property, but this is set by the launcher

Modified: ant/site/ant/production/manualdownload.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manualdownload.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/manualdownload.html (original)
+++ ant/site/ant/production/manualdownload.html Tue Apr 12 17:58:57 2016
@@ -253,11 +253,11 @@ Other mirrors: <select name="Preferred">
       <a name="Current Release of Ant"></a>
       Current Release of Ant
     </h3>
-                        <p>Currently, Apache Ant 1.9.6 is the best available version, see the
+                        <p>Currently, Apache Ant 1.9.7 is the best available version, see the
 <a href="[preferred]/ant/README.html">release notes</a>.</p>
                                 <div class="warning">
 <div class="label">Note</div>
-<div class="content">Ant 1.9.6 was released on 02-Jul-2015 and
+<div class="content">Ant 1.9.7 was released on 12-Apr-2016 and
 may not be available on all mirrors for a few days.</div>
 </div>
                                 <br />
@@ -268,25 +268,25 @@ may not be available on all mirrors for
 </div>
                                 <ul>
 <li><code>.zip</code> archive:
-<a href="[preferred]/ant/manual/apache-ant-1.9.6-manual.zip">apache-ant-1.9.6-manual.zip</a>
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.zip.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.zip.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.zip.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.zip.md5">MD5</a>]</li>
+<a href="[preferred]/ant/manual/apache-ant-1.9.7-manual.zip">apache-ant-1.9.7-manual.zip</a>
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.zip.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.zip.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.zip.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.zip.md5">MD5</a>]</li>
 
 <li><code>.tar.gz</code> archive:
-<a href="[preferred]/ant/manual/apache-ant-1.9.6-manual.tar.gz">apache-ant-1.9.6-manual.tar.gz</a>
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.tar.gz.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.tar.gz.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.tar.gz.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.tar.gz.md5">MD5</a>]</li>
+<a href="[preferred]/ant/manual/apache-ant-1.9.7-manual.tar.gz">apache-ant-1.9.7-manual.tar.gz</a>
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.tar.gz.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.tar.gz.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.tar.gz.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.tar.gz.md5">MD5</a>]</li>
 
 <li><code>.tar.bz2</code> archive:
-<a href="[preferred]/ant/manual/apache-ant-1.9.6-manual.tar.bz2">apache-ant-1.9.6-manual.tar.bz2</a>
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.tar.bz2.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.tar.bz2.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.tar.bz2.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.tar.bz2.md5">MD5</a>]</li>
+<a href="[preferred]/ant/manual/apache-ant-1.9.7-manual.tar.bz2">apache-ant-1.9.7-manual.tar.bz2</a>
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.tar.bz2.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.tar.bz2.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.tar.bz2.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.tar.bz2.md5">MD5</a>]</li>
 </ul>
                         <h3 class="section">
       <a name="Old Ant Releases"></a>
@@ -309,17 +309,17 @@ directory</a>, rather than from a mirror
 using</p>
                                 <p><code>
 % pgpk -a KEYS<br />
-% pgpv apache-ant-1.9.6-manual.tar.gz.asc<br />
+% pgpv apache-ant-1.9.7-manual.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % pgp -ka KEYS<br />
-% pgp apache-ant-1.9.6-manual.tar.gz.asc<br />
+% pgp apache-ant-1.9.7-manual.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % gpg --import KEYS<br />
-% gpg --verify apache-ant-1.9.6-manual.tar.gz.asc
+% gpg --verify apache-ant-1.9.7-manual.tar.gz.asc
 </code></p>
                                 <p>A command line version of <a href="http://www.gnupg.org/download/">GnuPG</a> 
 is also available for Windows users.  Follow the 

Modified: ant/site/ant/production/srcdownload.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/srcdownload.html?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/production/srcdownload.html (original)
+++ ant/site/ant/production/srcdownload.html Tue Apr 12 17:58:57 2016
@@ -257,11 +257,11 @@ Other mirrors: <select name="Preferred">
       <a name="Current Release of Apache Ant"></a>
       Current Release of Apache Ant
     </h3>
-                        <p>Currently, Apache Ant 1.9.6 is the best available version, see the
+                        <p>Currently, Apache Ant 1.9.7 is the best available version, see the
 <a href="[preferred]/ant/README.html">release notes</a>.</p>
                                 <div class="warning">
 <div class="label">Note</div>
-<div class="content">Ant 1.9.6 was released on 02-Jul-2015 and
+<div class="content">Ant 1.9.7 was released on 12-Apr-2016 and
 may not be available on all mirrors for a few days.</div>
 </div>
                                 <br />
@@ -272,25 +272,25 @@ may not be available on all mirrors for
 </div>
                                 <ul>
 <li><code>.zip</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.9.6-src.zip">apache-ant-1.9.6-src.zip</a>
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.zip.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.zip.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.zip.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.zip.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.9.7-src.zip">apache-ant-1.9.7-src.zip</a>
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.zip.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.zip.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.zip.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.zip.md5">MD5</a>]</li>
 
 <li><code>.tar.gz</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.9.6-src.tar.gz">apache-ant-1.9.6-src.tar.gz</a>
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.tar.gz.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.tar.gz.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.tar.gz.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.tar.gz.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.9.7-src.tar.gz">apache-ant-1.9.7-src.tar.gz</a>
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.gz.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.gz.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.gz.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.gz.md5">MD5</a>]</li>
 
 <li><code>.tar.bz2</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.9.6-src.tar.bz2">apache-ant-1.9.6-src.tar.bz2</a>
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.tar.bz2.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.tar.bz2.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.tar.bz2.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.tar.bz2.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.9.7-src.tar.bz2">apache-ant-1.9.7-src.tar.bz2</a>
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.bz2.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.bz2.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.bz2.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.bz2.md5">MD5</a>]</li>
 </ul>
                         <h3 class="section">
       <a name="Old Ant Releases"></a>
@@ -313,17 +313,17 @@ directory</a>, rather than from a mirror
 using</p>
                                 <p><code>
 % pgpk -a KEYS<br />
-% pgpv apache-ant-1.9.6-src.tar.gz.asc<br />
+% pgpv apache-ant-1.9.7-src.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % pgp -ka KEYS<br />
-% pgp apache-ant-1.9.6-src.tar.gz.asc<br />
+% pgp apache-ant-1.9.7-src.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % gpg --import KEYS<br />
-% gpg --verify apache-ant-1.9.6-src.tar.gz.asc
+% gpg --verify apache-ant-1.9.7-src.tar.gz.asc
 </code></p>
                                 <p>Alternatively, you can verify the checksums on the files.  Unix
 programs called <code>md5</code>/<code>sha1</code>/<code>sha512</code> or

Modified: ant/site/ant/sources/antnews.xml
URL: http://svn.apache.org/viewvc/ant/site/ant/sources/antnews.xml?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/sources/antnews.xml (original)
+++ ant/site/ant/sources/antnews.xml Tue Apr 12 17:58:57 2016
@@ -26,6 +26,15 @@
   </properties>
 
 <body>
+  <section name="Apache Ant 1.9.7">
+    <h3>Apr 12, 2016 - Apache Ant 1.9.7 Released</h3>
+    <p>Apache Ant 1.9.7 is now available for download as source or
+      binary from
+      <a href="http://ant.apache.org/bindownload.cgi">http://ant.apache.org/bindownload.cgi</a>.</p>
+
+    <p>Ant 1.9.7 contains several bug fixes and improvements compared to Ant 1.9.6.</p>
+  </section>
+
   <section name="Apache Ant 1.9.6">
     <h3>Jul 2, 2015 - Apache Ant 1.9.6 Released</h3>
     <p>Apache Ant 1.9.6 is now available for download as source or

Modified: ant/site/ant/sources/bindownload.xml
URL: http://svn.apache.org/viewvc/ant/site/ant/sources/bindownload.xml?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/sources/bindownload.xml (original)
+++ ant/site/ant/sources/bindownload.xml Tue Apr 12 17:58:57 2016
@@ -80,12 +80,12 @@ Other mirrors: <select name="Preferred">
 
 <section name="Current Release of Ant">
 
-<p>Currently, Apache Ant 1.9.6 is the best available version, see the
+<p>Currently, Apache Ant 1.9.7 is the best available version, see the
 <a href="[preferred]/ant/README.html">release notes</a>.</p>
 
 <div class="warning">
 <div class="label">Note</div>
-<div class="content">Ant 1.9.6 was released on 02-Jul-2015 and
+<div class="content">Ant 1.9.7 was released on 12-Apr-2016 and
 may not be available on all mirrors for a few days.</div>
 </div>
 <br></br>
@@ -97,25 +97,25 @@ may not be available on all mirrors for
 
 <ul>
 <li><code>.zip</code> archive:
-<a href="[preferred]/ant/binaries/apache-ant-1.9.6-bin.zip">apache-ant-1.9.6-bin.zip</a>
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.zip.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.zip.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.zip.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.zip.md5">MD5</a>]</li>
+<a href="[preferred]/ant/binaries/apache-ant-1.9.7-bin.zip">apache-ant-1.9.7-bin.zip</a>
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.zip.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.zip.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.zip.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.zip.md5">MD5</a>]</li>
 
 <li><code>.tar.gz</code> archive:
-<a href="[preferred]/ant/binaries/apache-ant-1.9.6-bin.tar.gz">apache-ant-1.9.6-bin.tar.gz</a>
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.tar.gz.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.tar.gz.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.tar.gz.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.tar.gz.md5">MD5</a>]</li>
+<a href="[preferred]/ant/binaries/apache-ant-1.9.7-bin.tar.gz">apache-ant-1.9.7-bin.tar.gz</a>
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.gz.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.gz.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.gz.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.gz.md5">MD5</a>]</li>
 
 <li><code>.tar.bz2</code> archive:
-<a href="[preferred]/ant/binaries/apache-ant-1.9.6-bin.tar.bz2">apache-ant-1.9.6-bin.tar.bz2</a>
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.tar.bz2.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.tar.bz2.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.tar.bz2.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.6-bin.tar.bz2.md5">MD5</a>]</li>
+<a href="[preferred]/ant/binaries/apache-ant-1.9.7-bin.tar.bz2">apache-ant-1.9.7-bin.tar.bz2</a>
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.bz2.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.bz2.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.bz2.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.7-bin.tar.bz2.md5">MD5</a>]</li>
 </ul>
 </section>
 
@@ -145,17 +145,17 @@ using</p>
 
 <p><code>
 % pgpk -a KEYS<br />
-% pgpv apache-ant-1.9.6-bin.tar.gz.asc<br />
+% pgpv apache-ant-1.9.7-bin.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % pgp -ka KEYS<br />
-% pgp apache-ant-1.9.6-bin.tar.gz.asc<br />
+% pgp apache-ant-1.9.7-bin.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % gpg --import KEYS<br />
-% gpg --verify apache-ant-1.9.6-bin.tar.gz.asc
+% gpg --verify apache-ant-1.9.7-bin.tar.gz.asc
 </code></p>
 
 <p>A command line version of <a href="http://www.gnupg.org/download/">GnuPG</a> 

Modified: ant/site/ant/sources/faq.xml
URL: http://svn.apache.org/viewvc/ant/site/ant/sources/faq.xml?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/sources/faq.xml (original)
+++ ant/site/ant/sources/faq.xml Tue Apr 12 17:58:57 2016
@@ -255,6 +255,10 @@
             <td>1.9.6</td>
             <td>02 Jul 2015</td>
           </tr>
+          <tr>
+            <td>1.9.7</td>
+            <td>12 Apr 2016</td>
+          </tr>
         </table>
       </answer>
     </faq>

Modified: ant/site/ant/sources/index.xml
URL: http://svn.apache.org/viewvc/ant/site/ant/sources/index.xml?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/sources/index.xml (original)
+++ ant/site/ant/sources/index.xml Tue Apr 12 17:58:57 2016
@@ -67,15 +67,13 @@
     version of Java.</p>
   </section>
   
-  <section name="Apache Ant 1.9.6">
-    <h3>Jul 2, 2015 - Apache Ant 1.9.6 Released</h3>
-    <p>Apache Ant 1.9.6 is now available for download as source or
+  <section name="Apache Ant 1.9.7">
+    <h3>Apr 12, 2016 - Apache Ant 1.9.7 Released</h3>
+    <p>Apache Ant 1.9.7 is now available for download as source or
       binary from
       <a href="http://ant.apache.org/bindownload.cgi">http://ant.apache.org/bindownload.cgi</a>.</p>
 
-    <p>Ant 1.9.6 fixes a regression in the zip package introduced with
-    Ant 1.9.5.</p>
-
+    <p>Ant 1.9.7 contains several bug fixes and improvements compared to Ant 1.9.6.</p>
   </section>
 
   <section name="Apache IvyDE 2.2.0">
@@ -163,7 +161,7 @@
   <section name="Documentation">
 
 <p>
-You can view the documentation for the current release (Apache Ant 1.9.6)
+You can view the documentation for the current release (Apache Ant 1.9.7)
 <a href="manual/index.html">online</a>
 </p>
 

Modified: ant/site/ant/sources/manualdownload.xml
URL: http://svn.apache.org/viewvc/ant/site/ant/sources/manualdownload.xml?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/sources/manualdownload.xml (original)
+++ ant/site/ant/sources/manualdownload.xml Tue Apr 12 17:58:57 2016
@@ -75,12 +75,12 @@ Other mirrors: <select name="Preferred">
 
 <section name="Current Release of Ant">
 
-<p>Currently, Apache Ant 1.9.6 is the best available version, see the
+<p>Currently, Apache Ant 1.9.7 is the best available version, see the
 <a href="[preferred]/ant/README.html">release notes</a>.</p>
 
 <div class="warning">
 <div class="label">Note</div>
-<div class="content">Ant 1.9.6 was released on 02-Jul-2015 and
+<div class="content">Ant 1.9.7 was released on 12-Apr-2016 and
 may not be available on all mirrors for a few days.</div>
 </div>
 <br></br>
@@ -92,25 +92,25 @@ may not be available on all mirrors for
 
 <ul>
 <li><code>.zip</code> archive:
-<a href="[preferred]/ant/manual/apache-ant-1.9.6-manual.zip">apache-ant-1.9.6-manual.zip</a>
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.zip.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.zip.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.zip.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.zip.md5">MD5</a>]</li>
+<a href="[preferred]/ant/manual/apache-ant-1.9.7-manual.zip">apache-ant-1.9.7-manual.zip</a>
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.zip.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.zip.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.zip.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.zip.md5">MD5</a>]</li>
 
 <li><code>.tar.gz</code> archive:
-<a href="[preferred]/ant/manual/apache-ant-1.9.6-manual.tar.gz">apache-ant-1.9.6-manual.tar.gz</a>
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.tar.gz.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.tar.gz.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.tar.gz.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.tar.gz.md5">MD5</a>]</li>
+<a href="[preferred]/ant/manual/apache-ant-1.9.7-manual.tar.gz">apache-ant-1.9.7-manual.tar.gz</a>
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.tar.gz.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.tar.gz.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.tar.gz.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.tar.gz.md5">MD5</a>]</li>
 
 <li><code>.tar.bz2</code> archive:
-<a href="[preferred]/ant/manual/apache-ant-1.9.6-manual.tar.bz2">apache-ant-1.9.6-manual.tar.bz2</a>
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.tar.bz2.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.tar.bz2.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.tar.bz2.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.6-manual.tar.bz2.md5">MD5</a>]</li>
+<a href="[preferred]/ant/manual/apache-ant-1.9.7-manual.tar.bz2">apache-ant-1.9.7-manual.tar.bz2</a>
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.tar.bz2.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.tar.bz2.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.tar.bz2.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.7-manual.tar.bz2.md5">MD5</a>]</li>
 </ul>
 </section>
 
@@ -138,17 +138,17 @@ using</p>
 
 <p><code>
 % pgpk -a KEYS<br />
-% pgpv apache-ant-1.9.6-manual.tar.gz.asc<br />
+% pgpv apache-ant-1.9.7-manual.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % pgp -ka KEYS<br />
-% pgp apache-ant-1.9.6-manual.tar.gz.asc<br />
+% pgp apache-ant-1.9.7-manual.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % gpg --import KEYS<br />
-% gpg --verify apache-ant-1.9.6-manual.tar.gz.asc
+% gpg --verify apache-ant-1.9.7-manual.tar.gz.asc
 </code></p>
 
 <p>A command line version of <a href="http://www.gnupg.org/download/">GnuPG</a> 

Modified: ant/site/ant/sources/srcdownload.xml
URL: http://svn.apache.org/viewvc/ant/site/ant/sources/srcdownload.xml?rev=1738839&r1=1738838&r2=1738839&view=diff
==============================================================================
--- ant/site/ant/sources/srcdownload.xml (original)
+++ ant/site/ant/sources/srcdownload.xml Tue Apr 12 17:58:57 2016
@@ -77,12 +77,12 @@ Other mirrors: <select name="Preferred">
 
 <section name="Current Release of Apache Ant">
 
-<p>Currently, Apache Ant 1.9.6 is the best available version, see the
+<p>Currently, Apache Ant 1.9.7 is the best available version, see the
 <a href="[preferred]/ant/README.html">release notes</a>.</p>
 
 <div class="warning">
 <div class="label">Note</div>
-<div class="content">Ant 1.9.6 was released on 02-Jul-2015 and
+<div class="content">Ant 1.9.7 was released on 12-Apr-2016 and
 may not be available on all mirrors for a few days.</div>
 </div>
 <br></br>
@@ -94,25 +94,25 @@ may not be available on all mirrors for
 
 <ul>
 <li><code>.zip</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.9.6-src.zip">apache-ant-1.9.6-src.zip</a>
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.zip.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.zip.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.zip.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.zip.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.9.7-src.zip">apache-ant-1.9.7-src.zip</a>
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.zip.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.zip.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.zip.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.zip.md5">MD5</a>]</li>
 
 <li><code>.tar.gz</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.9.6-src.tar.gz">apache-ant-1.9.6-src.tar.gz</a>
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.tar.gz.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.tar.gz.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.tar.gz.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.tar.gz.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.9.7-src.tar.gz">apache-ant-1.9.7-src.tar.gz</a>
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.gz.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.gz.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.gz.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.gz.md5">MD5</a>]</li>
 
 <li><code>.tar.bz2</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.9.6-src.tar.bz2">apache-ant-1.9.6-src.tar.bz2</a>
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.tar.bz2.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.tar.bz2.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.tar.bz2.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.6-src.tar.bz2.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.9.7-src.tar.bz2">apache-ant-1.9.7-src.tar.bz2</a>
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.bz2.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.bz2.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.bz2.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.bz2.md5">MD5</a>]</li>
 </ul>
 </section>
 
@@ -142,17 +142,17 @@ using</p>
 
 <p><code>
 % pgpk -a KEYS<br />
-% pgpv apache-ant-1.9.6-src.tar.gz.asc<br />
+% pgpv apache-ant-1.9.7-src.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % pgp -ka KEYS<br />
-% pgp apache-ant-1.9.6-src.tar.gz.asc<br />
+% pgp apache-ant-1.9.7-src.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % gpg --import KEYS<br />
-% gpg --verify apache-ant-1.9.6-src.tar.gz.asc
+% gpg --verify apache-ant-1.9.7-src.tar.gz.asc
 </code></p>
 
 <p>Alternatively, you can verify the checksums on the files.  Unix