Author: bodewig
Date: Thu Mar 1 19:10:02 2012
New Revision: 1295751
URL: http://svn.apache.org/viewvc?rev=1295751&view=rev
Log:
merge post-release cleanup from trunk
Removed:
ant/core/branches/ANT_18_BRANCH/doap_Ant.rdf
Modified:
ant/core/branches/ANT_18_BRANCH/ (props changed)
ant/core/branches/ANT_18_BRANCH/ReleaseInstructions
ant/core/branches/ANT_18_BRANCH/manual/Tasks/include.html (props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarBuffer.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarEntry.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarOutputStream.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ (props
changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ExtraFieldUtils.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/FallbackZipEncoding.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/NioZipEncoding.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnicodePathExtraField.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnrecognizedExtraField.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEncoding.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEncodingHelper.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEntry.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipFile.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipOutputStream.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipUtil.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/
(props changed)
ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java
(props changed)
ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java
(props changed)
Propchange: ant/core/branches/ANT_18_BRANCH/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1 +1 @@
-/ant/core/trunk:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
Modified: ant/core/branches/ANT_18_BRANCH/ReleaseInstructions
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/ReleaseInstructions?rev=1295751&r1=1295750&r2=1295751&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/ReleaseInstructions (original)
+++ ant/core/branches/ANT_18_BRANCH/ReleaseInstructions Thu Mar 1 19:10:02 2012
@@ -73,9 +73,8 @@ Note: This document was updated in the c
6. Ensure you have all the external libraries that Ant uses in your
- lib/optional directory. In fact NetRexxC/NetRexxR are the only commercial
- dependencies as of 1.8.0 which are "hard to find". Other dependencies are
- either provided by JDK 1.5.0 or downloadable using
+ lib/optional directory. All dependencies are either provided by
+ JDK 1.5.0 or downloadable using
ant -f fetch.xml -Ddest=optional.
To find out whether you have all the libraries you need, execute
the build with -verbose option and scan for lines beginning with
@@ -114,8 +113,8 @@ Note: This document was updated in the c
Before you do that, ensure that the key you use is inside the KEYS
file in Ant's SVN repository
<https://svn.apache.org/repos/asf/ant/antlibs/common/trunk/KEYS> -
- and that you perform a svn update on the KEYS file in
- /www/www.apache.org/dist/ant/common
+ and that you copy the KEYS file to
+ /www/www.apache.org/dist/ant
Also make sure you have sent the key that you use to a public
keyserver.
@@ -143,8 +142,8 @@ Note: This document was updated in the c
13. Once the vote has passed, create the release directory,
something like v1.7.0Beta1, push the release and RELEASE-NOTES files
- into this directory. Create a symbolic link named README.html
- that points to the RELEASE-NOTES.
+ into this directory. Create a hardlink named README.html
+ that points to the RELEASE-NOTES (or copy over the RELEASE-NOTES file)
The files should go to /www/www.apache.org/dist/ant/ on people.apache.org.
@@ -163,10 +162,9 @@ Note: This document was updated in the c
If it looks OK, announce it on dev@ant and user@ant. After a few
days pass and there are no major problems, a wider announcement is
- made (ant website, main jakarta website, [email protected],
- etc).
+ made (ant website, [email protected], etc).
- Announce beta releases at freshmeat.net (Stefan Bodewig is the
+ Announce beta releases at freecode.com (Stefan Bodewig is the
owner of Ant's project entry - bug him ;-).
16. As problems in the beta are discovered, there may be a need for
@@ -220,12 +218,8 @@ Note: This document was updated in the c
4 hours later, the artefacts will be in the maven central repository.
- * remove the symbolic links from /www/www.apache.org/dist/ant.
-
- * Create proper -current symlinks in /www/www.apache.org/dist/ant/
-
- * Make sure that the symbolic link README.html points to the new
- RELEASE-NOTES.
+ * Make README.html points to the new RELEASE-NOTES or is a copy of
+ it.
(*)
@@ -243,7 +237,7 @@ Note: This document was updated in the c
* source/bindownload.xml
* source/manualdownload.xml
- Generate the html files by invoking 'ant docs'
+ Generate the html files by invoking 'ant'
Commit the modified/generated files in the 'production' folder, it will go
live on ant.apache.org in a matter on seconds.
@@ -268,15 +262,12 @@ Note: This document was updated in the c
Also identify the webpages to which the announcements must go. ]]
Apache mailing lists that should get the announcements:
- [email protected], [email protected],
[email protected], dev@ant and user@ant.
- Announce release at freshmeat.net
+ Announce release at freecode.com
(Stefan Bodewig is the owner of Ant's project entry - bug him ;-).
- Announce release in the usenet group comp.lang.java.softwaretools .
-
-24. Add a new release tag to doap_Ant.rdf in Ant's trunk.
+24. Add a new release tag to doap_Ant.rdf in Ant's site.
25. You can now reacquaint yourself with your family and friends.
Propchange: ant/core/branches/ANT_18_BRANCH/manual/Tasks/include.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,2 +1,2 @@
/ant/core/trunk/docs/manual/CoreTasks/import.html:713353
-/ant/core/trunk/manual/Tasks/include.html:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/manual/Tasks/include.html:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java:945039
-/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarBuffer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java:1027427
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/tar/TarEntry.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/tar/TarEntry.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java:755227,755472
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarOutputStream.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/tar/TarOutputStream.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/tar/TarOutputStream.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java:1027427
Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/zip:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip:746933,748133,749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java:746933,748063,748133,748288,749342,749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ExtraFieldUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java:910483-910521
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java:745528,746933,748133,749524,749603,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/FallbackZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/FallbackZipEncoding.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/zip/FallbackZipEncoding.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/FallbackZipEncoding.java:749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/NioZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java:749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java:749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java:746933,748063,748133,749342,749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnicodePathExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java:746933,748063,748133,749342,749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1 +1 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnrecognizedExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnrecognizedExtraField.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/zip/UnrecognizedExtraField.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java:910483-910521
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java:746933,748133,749603,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncoding.java:749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEncodingHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java:909456
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java:746933,747841,748133,749342-749344,749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,4 +1,4 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java:910483-910521
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java:747850,749603
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEntry.java:746933,748133,749524,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipFile.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:911740,1146027,1153735
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:745920,746933,748133,748556,749342-749344,749524,749603,749855,749859
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipOutputStream.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipOutputStream.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipOutputStream.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java:911740
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java:745920,747810,747841,748063,749342,749906-749907,750055,750310
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipUtil.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1 +1 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipUtil.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipUtil.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
Propchange:
ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip:749906-749907
Propchange:
ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java:910483-910521
/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java:749906-749907
Propchange:
ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java:749342-749344,749906-749907
Propchange:
ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 19:10:02 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745,1295749
/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java:896818
/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java:749603
