Author: bodewig
Date: Thu Jul 28 04:04:11 2011
New Revision: 1151721
URL: http://svn.apache.org/viewvc?rev=1151721&view=rev
Log:
sync
Modified:
commons/proper/compress/branches/zip64/ (props changed)
commons/proper/compress/branches/zip64/pom.xml
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/tar/
(props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
(props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java
(props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/
(props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
(props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
(props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
(props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
(contents, props changed)
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
(props changed)
commons/proper/compress/branches/zip64/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java
(props changed)
Propchange: commons/proper/compress/branches/zip64/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 28 04:04:11 2011
@@ -1 +1 @@
-/commons/proper/compress/trunk:1149597-1151330
+/commons/proper/compress/trunk:1149597-1151719
Modified: commons/proper/compress/branches/zip64/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/pom.xml?rev=1151721&r1=1151720&r2=1151721&view=diff
==============================================================================
--- commons/proper/compress/branches/zip64/pom.xml (original)
+++ commons/proper/compress/branches/zip64/pom.xml Thu Jul 28 04:04:11 2011
@@ -41,7 +41,7 @@
<commons.jira.pid>12310904</commons.jira.pid>
<!-- configuration bits for cutting a release candidate -->
<commons.release.version>1.2</commons.release.version>
- <commons.rc.version>RC1</commons.rc.version>
+ <commons.rc.version>RC2</commons.rc.version>
</properties>
<issueManagement>
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/tar/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 28 04:04:11 2011
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/tar:741089
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar:1149597-1151330
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar:1149597-1151719
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 28 04:04:11 2011
@@ -1,3 +1,3 @@
/ant/core/trunk/src/main/org/apache/tools/tar/TarArchiveEntry.java:741089
/ant/core/trunk/src/main/org/apache/tools/tar/TarEntry.java:807513,823136
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java:1149597-1151330
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java:1149597-1151719
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 28 04:04:11 2011
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java:741089,789556
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java:1149597-1151330
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java:1149597-1151719
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 28 04:04:11 2011
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/zip:738844,739300,741089
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip:1149597-1151330
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip:1149597-1151719
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 28 04:04:11 2011
@@ -1 +1 @@
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java:1149597-1151330
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java:1149597-1151719
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 28 04:04:11 2011
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java:745537
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java:1149597-1151330
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java:1149597-1151719
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 28 04:04:11 2011
@@ -1 +1 @@
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java:1149597-1151330
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java:1149597-1151719
Modified:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java?rev=1151721&r1=1151720&r2=1151721&view=diff
==============================================================================
---
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
(original)
+++
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
Thu Jul 28 04:04:11 2011
@@ -333,7 +333,7 @@ public class ZipFile {
/**
* Ensures that the close method of this zipfile is called when
* there are no more references to it.
- * @see close()
+ * @see #close()
*/
protected void finalize() throws Throwable {
try {
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 28 04:04:11 2011
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java:738844,738853,739300,741089,747002,1146020
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:1149597-1151330
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:1149597-1151719
Propchange:
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 28 04:04:11 2011
@@ -1,2 +1,2 @@
/ant/core/trunk/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java:741089
-/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java:1149597-1151330
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java:1149597-1151719
Propchange:
commons/proper/compress/branches/zip64/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 28 04:04:11 2011
@@ -1,2 +1,2 @@
/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java:745537
-/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java:1149597-1151330
+/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java:1149597-1151719
