Push fix for PR#17934 to 1.6.2

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276482 13f79535-47bb-0310-9956-ffa450edef68

WHATSNEW

@@ -16,12 +16,6 @@ Other changes:
 * Enable to choose the regexp implementation without system property.
   Bugzilla Report 15390.
 
-* A new roundup attribute on <zip> and related task can be used to
-  control whether the file modification times inside the archive will
-  be rounded up or down (since zips only store modification times with
-  a granularity of two seconds).  The default remains to round up.
-  Bugzilla Report 17934.
-
 * Nested file mappers and a container mapper implementation have been
   introduced.  Additionally, the <mapper> element now accepts "defined"
   nested FileNameMapper implementations directly, allowing a usage
@@ -185,6 +179,11 @@ Other changes:
 
 * Ignore built distributions. Bugzilla Report 28997.
 
+* A new roundup attribute on <zip> and related task can be used to
+  control whether the file modification times inside the archive will
+  be rounded up or down (since zips only store modification times with
+  a granularity of two seconds).  The default remains to round up.
+  Bugzilla Report 17934.
 
 Changes from Ant 1.6.0 to Ant 1.6.1
 =============================================

docs/manual/CoreTasks/ear.html

@@ -125,7 +125,7 @@ attributes of zipfilesets in a Zip or Jar task.)</p>
     lead to a different type of problems like JSPs inside a web
     archive that seem to be slightly more recent than precompiled
     pages, rendering precompilation useless.<br>
-    Defaults to true.  <em>Since Ant 1.7</em></td>
+    Defaults to true.  <em>Since Ant 1.6.2</em></td>
     <td align="center" valign="top">No</td>
   </tr>
 </table>

docs/manual/CoreTasks/jar.html

@@ -185,7 +185,7 @@ being wrapped and continued on the next line.
     lead to a different type of problems like JSPs inside a web
     archive that seem to be slightly more recent than precompiled
     pages, rendering precompilation useless.<br>
-    Defaults to true.  <em>Since Ant 1.7</em></td>
+    Defaults to true.  <em>Since Ant 1.6.2</em></td>
     <td align="center" valign="top">No</td>
   </tr>
 </table>

docs/manual/CoreTasks/war.html

@@ -132,7 +132,7 @@ attributes of zipfilesets in a Zip or Jar task.)</p>
     lead to a different type of problems like JSPs inside a web
     archive that seem to be slightly more recent than precompiled
     pages, rendering precompilation useless.<br>
-    Defaults to true.  <em>Since Ant 1.7</em></td>
+    Defaults to true.  <em>Since Ant 1.6.2</em></td>
     <td align="center" valign="top">No</td>
   </tr>
 </table>

docs/manual/CoreTasks/zip.html

@@ -175,7 +175,7 @@ versions of zip and unzip for many Unix and Unix-like systems.</p>
     lead to a different type of problems like JSPs inside a web
     archive that seem to be slightly more recent than precompiled
     pages, rendering precompilation useless.<br>
-    Defaults to true.  <em>Since Ant 1.7</em></td>
+    Defaults to true.  <em>Since Ant 1.6.2</em></td>
     <td align="center" valign="top">No</td>
   </tr>
 </table>

src/main/org/apache/tools/ant/taskdefs/Zip.java

@@ -110,7 +110,7 @@ public class Zip extends MatchingTask {
      * Whether the file modification times will be rounded up to the
      * next even number of seconds.
      *
-     * @since Ant 1.7
+     * @since Ant 1.6.2
      */
     private boolean roundUp = true;
 
@@ -303,7 +303,7 @@ public class Zip extends MatchingTask {
      * JSPs inside a web archive that seem to be slightly more recent
      * than precompiled pages, rendering precompilation useless.</p>
      *
-     * @since Ant 1.7
+     * @since Ant 1.6.2
      */
     public void setRoundUp(boolean r) {
         roundUp = r;