You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by pk...@apache.org on 2024/11/18 10:28:32 UTC
(commons-compress) branch feature/remove-commons-lang updated (dffd19870 -> ff2cf580b)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch feature/remove-commons-lang
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
from dffd19870 Fix indentation
add c3dca5e99 ExtraField implements Iterable<SubField>
add d781589a0 Revert "Replace org.apache.commons.io.Charsets with org.apache.commons.compress.utils.Charsets"
add 860226c43 Add missing Javadoc description and @return
add f49db0046 Add mising Javadoc in ArchiveStreamFactory
new ff2cf580b Merge remote-tracking branch 'apache/master' into feature/remove-commons-lang
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../compress/archivers/ArchiveInputStream.java | 52 ++++++++++-------
.../compress/archivers/ArchiveStreamFactory.java | 12 ++++
.../archivers/tar/TarArchiveOutputStream.java | 2 +-
.../archivers/zip/ZipArchiveOutputStream.java | 2 +-
.../compress/archivers/zip/ZipEncodingHelper.java | 2 +-
.../commons/compress/archivers/zip/ZipFile.java | 4 +-
.../{HeaderExtraField.java => ExtraField.java} | 67 +++++++++++++++-------
.../gzip/GzipCompressorInputStream.java | 2 +-
.../gzip/GzipCompressorOutputStream.java | 2 +-
.../compress/compressors/gzip/GzipParameters.java | 10 ++--
.../gzip/GzipCompressorOutputStreamTest.java | 42 ++++++++++----
11 files changed, 133 insertions(+), 64 deletions(-)
rename src/main/java/org/apache/commons/compress/compressors/gzip/{HeaderExtraField.java => ExtraField.java} (75%)
(commons-compress) 01/01: Merge remote-tracking branch 'apache/master' into feature/remove-commons-lang
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch feature/remove-commons-lang
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
commit ff2cf580bfb781da2ae5e59f79aa9982dc92e72c
Merge: dffd19870 f49db0046
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Mon Nov 18 11:28:23 2024 +0100
Merge remote-tracking branch 'apache/master' into feature/remove-commons-lang
.../compress/archivers/ArchiveInputStream.java | 52 ++++++++++-------
.../compress/archivers/ArchiveStreamFactory.java | 12 ++++
.../archivers/tar/TarArchiveOutputStream.java | 2 +-
.../archivers/zip/ZipArchiveOutputStream.java | 2 +-
.../compress/archivers/zip/ZipEncodingHelper.java | 2 +-
.../commons/compress/archivers/zip/ZipFile.java | 4 +-
.../{HeaderExtraField.java => ExtraField.java} | 67 +++++++++++++++-------
.../gzip/GzipCompressorInputStream.java | 2 +-
.../gzip/GzipCompressorOutputStream.java | 2 +-
.../compress/compressors/gzip/GzipParameters.java | 10 ++--
.../gzip/GzipCompressorOutputStreamTest.java | 42 ++++++++++----
11 files changed, 133 insertions(+), 64 deletions(-)
diff --cc src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
index cbd87ae06,4f3588d9b..1dde3deae
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
@@@ -38,12 -38,12 +38,12 @@@ import java.util.Map
import org.apache.commons.compress.archivers.ArchiveOutputStream;
import org.apache.commons.compress.archivers.zip.ZipEncoding;
import org.apache.commons.compress.archivers.zip.ZipEncodingHelper;
+import org.apache.commons.compress.internal.lang3.ArrayFill;
- import org.apache.commons.compress.utils.Charsets;
import org.apache.commons.compress.utils.FixedLengthBlockOutputStream;
import org.apache.commons.compress.utils.TimeUtils;
+ import org.apache.commons.io.Charsets;
import org.apache.commons.io.file.attribute.FileTimes;
import org.apache.commons.io.output.CountingOutputStream;
-import org.apache.commons.lang3.ArrayFill;
/**
* The TarOutputStream writes a UNIX tar archive as an OutputStream. Methods are provided to put entries, and then write their contents by writing to this