Author: bodewig
Date: Sun Feb 26 06:12:05 2012
New Revision: 1293746
URL: http://svn.apache.org/viewvc?rev=1293746&view=rev
Log:
merge fix for javadoc artifact name from trunk
Modified:
ant/core/branches/ANT_18_BRANCH/ (props changed)
ant/core/branches/ANT_18_BRANCH/build.xml
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 Sun Feb 26 06:12:05 2012
@@ -1 +1 @@
-/ant/core/trunk:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk:1240672-1292395,1292976,1292985,1293648,1293659,1293745
Modified: ant/core/branches/ANT_18_BRANCH/build.xml
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/build.xml?rev=1293746&r1=1293745&r2=1293746&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/build.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/build.xml Sun Feb 26 06:12:05 2012
@@ -1233,7 +1233,7 @@
</fileset>
<mapper type="regexp" from="ant(.*).jar"
to="ant\1/${project.version}/ant\1-${project.version}-sources.jar"/>
</copy>
- <jar
destfile="${java-repository.dir}/ant/${project.version}/ant-${project.version}-javadocs.jar"
+ <jar
destfile="${java-repository.dir}/ant/${project.version}/ant-${project.version}-javadoc.jar"
basedir="${build.javadocs}">
<metainf dir="${build.dir}">
<include name="LICENSE.txt"/>
@@ -1243,7 +1243,7 @@
<checksums-mvn>
<fileset dir="${java-repository.dir}"
includes="**/*${project.version}.jar"/>
<fileset dir="${java-repository.dir}"
includes="**/*${project.version}-sources.jar"/>
- <fileset dir="${java-repository.dir}"
includes="**/*${project.version}-javadocs.jar"/>
+ <fileset dir="${java-repository.dir}"
includes="**/*${project.version}-javadoc.jar"/>
<fileset dir="${java-repository.dir}"
includes="**/*${project.version}.pom"/>
</checksums-mvn>
Propchange: ant/core/branches/ANT_18_BRANCH/manual/Tasks/include.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 26 06:12:05 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
+/ant/core/trunk/manual/Tasks/include.html:1240672-1292395,1292976,1292985,1293648,1293659,1293745
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 26 06:12:05 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
+/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarBuffer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 26 06:12:05 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/tar/TarEntry.java:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk/src/main/org/apache/tools/tar/TarEntry.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/tar/TarOutputStream.java:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk/src/main/org/apache/tools/tar/TarOutputStream.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk/src/main/org/apache/tools/zip:1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 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
+/ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 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
+/ant/core/trunk/src/main/org/apache/tools/zip/FallbackZipEncoding.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 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
+/ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 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
+/ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 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
+/ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 2012
@@ -1 +1 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
Propchange:
ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnrecognizedExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 26 06:12:05 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnrecognizedExtraField.java:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk/src/main/org/apache/tools/zip/UnrecognizedExtraField.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 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
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 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
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 2012
@@ -1,4 +1,4 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipOutputStream.java:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipOutputStream.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 2012
@@ -1 +1 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipUtil.java:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipUtil.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
Propchange:
ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 26 06:12:05 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip:1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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 Sun Feb 26 06:12:05 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java:1240672-1292395,1292976,1292985,1293648,1293659
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java:1240672-1292395,1292976,1292985,1293648,1293659,1293745
/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
