bodewig 2004/05/25 04:48:20
Modified: . WHATSNEW
docs/manual/CoreTasks ear.html jar.html war.html zip.html
src/main/org/apache/tools/ant/taskdefs Zip.java
Log:
Push fix for PR#17934 to 1.6.2
Revision Changes Path
1.608 +5 -6 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.607
retrieving revision 1.608
diff -u -r1.607 -r1.608
--- WHATSNEW 18 May 2004 09:03:33 -0000 1.607
+++ WHATSNEW 25 May 2004 11:48:19 -0000 1.608
@@ -16,12 +16,6 @@
* 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 @@
* 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
=============================================
1.19 +1 -1 ant/docs/manual/CoreTasks/ear.html
Index: ear.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/ear.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ear.html 27 Feb 2004 14:17:41 -0000 1.18
+++ ear.html 25 May 2004 11:48:20 -0000 1.19
@@ -125,7 +125,7 @@
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>
1.32 +1 -1 ant/docs/manual/CoreTasks/jar.html
Index: jar.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/jar.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jar.html 13 May 2004 07:05:02 -0000 1.31
+++ jar.html 25 May 2004 11:48:20 -0000 1.32
@@ -185,7 +185,7 @@
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>
1.23 +1 -1 ant/docs/manual/CoreTasks/war.html
Index: war.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/war.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- war.html 27 Feb 2004 14:17:41 -0000 1.22
+++ war.html 25 May 2004 11:48:20 -0000 1.23
@@ -132,7 +132,7 @@
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>
1.25 +1 -1 ant/docs/manual/CoreTasks/zip.html
Index: zip.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/zip.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- zip.html 27 Feb 2004 14:17:41 -0000 1.24
+++ zip.html 25 May 2004 11:48:20 -0000 1.25
@@ -175,7 +175,7 @@
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>
1.125 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- Zip.java 16 Apr 2004 09:35:21 -0000 1.124
+++ Zip.java 25 May 2004 11:48:20 -0000 1.125
@@ -110,7 +110,7 @@
* 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 @@
* 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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
