You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/06/12 13:24:43 UTC
[commons-compress] 01/02: Merge from develop and resolve conflicts
in pom.xml.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch pack200
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
commit c754db31c66eee16e4839dfe58686f57e8cb189c
Merge: e3ea7b6 ae2b27c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 11 16:56:17 2021 -0400
Merge from develop and resolve conflicts in pom.xml.
.github/workflows/maven.yml | 15 +-
.gitignore | 14 +-
.travis.yml | 8 +-
CODE_OF_CONDUCT.md | 17 +
README.md | 1 +
SECURITY.md | 17 +
pom.xml | 52 +-
src/changes/changes.xml | 199 +++++-
.../compress/archivers/ArchiveInputStream.java | 2 +-
.../compress/archivers/ArchiveOutputStream.java | 2 +-
.../compress/archivers/ArchiveStreamFactory.java | 16 +-
.../apache/commons/compress/archivers/Lister.java | 16 +-
.../compress/archivers/ar/ArArchiveEntry.java | 9 +-
.../archivers/ar/ArArchiveInputStream.java | 12 +-
.../archivers/ar/ArArchiveOutputStream.java | 24 +-
.../compress/archivers/arj/ArjArchiveEntry.java | 8 +-
.../archivers/arj/ArjArchiveInputStream.java | 8 +-
.../compress/archivers/arj/LocalFileHeader.java | 2 +-
.../commons/compress/archivers/arj/MainHeader.java | 2 +-
.../compress/archivers/cpio/CpioArchiveEntry.java | 32 +-
.../archivers/cpio/CpioArchiveInputStream.java | 15 +-
.../archivers/cpio/CpioArchiveOutputStream.java | 9 +-
.../commons/compress/archivers/cpio/CpioUtil.java | 4 +-
.../archivers/dump/DumpArchiveConstants.java | 4 +-
.../compress/archivers/dump/DumpArchiveEntry.java | 7 +-
.../archivers/dump/DumpArchiveInputStream.java | 18 +-
.../archivers/dump/DumpArchiveSummary.java | 6 +-
.../compress/archivers/dump/TapeInputStream.java | 4 +-
.../compress/archivers/examples/Archiver.java | 5 +-
.../compress/archivers/examples/Expander.java | 35 +-
.../archivers/jar/JarArchiveOutputStream.java | 2 +-
.../archivers/sevenz/AES256SHA256Decoder.java | 4 +-
.../commons/compress/archivers/sevenz/Archive.java | 4 +-
.../BoundedSeekableByteChannelInputStream.java | 4 +-
.../commons/compress/archivers/sevenz/CLI.java | 2 +-
.../commons/compress/archivers/sevenz/Coder.java | 2 +-
.../compress/archivers/sevenz/CoderBase.java | 6 +-
.../commons/compress/archivers/sevenz/Coders.java | 4 +-
.../commons/compress/archivers/sevenz/Folder.java | 23 +-
.../archivers/sevenz/SevenZArchiveEntry.java | 6 +-
.../compress/archivers/sevenz/SevenZFile.java | 706 +++++++++++++++++--
.../archivers/sevenz/SevenZFileOptions.java | 17 +-
.../compress/archivers/sevenz/SevenZMethod.java | 5 +-
.../archivers/sevenz/SevenZOutputFile.java | 6 +-
.../compress/archivers/tar/TarArchiveEntry.java | 219 ++++--
.../archivers/tar/TarArchiveInputStream.java | 323 ++-------
.../archivers/tar/TarArchiveOutputStream.java | 22 +-
.../archivers/tar/TarArchiveSparseEntry.java | 16 +-
.../TarArchiveSparseZeroInputStream.java} | 42 +-
.../archivers/tar/TarArchiveStructSparse.java | 6 +
.../commons/compress/archivers/tar/TarFile.java | 750 +++++++++++++++++++++
.../commons/compress/archivers/tar/TarUtils.java | 318 ++++++++-
.../compress/archivers/zip/AsiExtraField.java | 28 +-
.../commons/compress/archivers/zip/BinaryTree.java | 16 +-
.../archivers/zip/ExplodingInputStream.java | 9 +-
.../compress/archivers/zip/ExtraFieldUtils.java | 34 +-
.../compress/archivers/zip/GeneralPurposeBit.java | 8 +-
.../zip/InflaterInputStreamWithStatistics.java | 4 +-
.../commons/compress/archivers/zip/JarMarker.java | 7 +-
.../compress/archivers/zip/NioZipEncoding.java | 16 +-
.../archivers/zip/ParallelScatterZipCreator.java | 33 +-
.../archivers/zip/ResourceAlignmentExtraField.java | 2 +-
.../archivers/zip/ScatterZipOutputStream.java | 2 +-
.../compress/archivers/zip/StreamCompressor.java | 6 +-
.../archivers/zip/UnshrinkingInputStream.java | 36 +-
.../zip/X0017_StrongEncryptionHeader.java | 10 +-
.../compress/archivers/zip/X7875_NewUnix.java | 9 +-
.../zip/Zip64ExtendedInformationExtraField.java | 6 +-
.../commons/compress/archivers/zip/Zip64Mode.java | 12 +-
.../compress/archivers/zip/ZipArchiveEntry.java | 42 +-
.../archivers/zip/ZipArchiveInputStream.java | 108 ++-
.../archivers/zip/ZipArchiveOutputStream.java | 98 ++-
.../commons/compress/archivers/zip/ZipFile.java | 179 ++---
.../commons/compress/archivers/zip/ZipMethod.java | 2 +-
.../archivers/zip/ZipSplitOutputStream.java | 16 +-
.../zip/ZipSplitReadOnlySeekableByteChannel.java | 9 +-
.../commons/compress/archivers/zip/ZipUtil.java | 7 +-
.../apache/commons/compress/changes/ChangeSet.java | 1 -
.../compressors/CompressorInputStream.java | 2 +-
.../compressors/CompressorStreamFactory.java | 2 +-
.../compress/compressors/brotli/BrotliUtils.java | 10 +-
.../bzip2/BZip2CompressorInputStream.java | 48 +-
.../bzip2/BZip2CompressorOutputStream.java | 24 +-
.../compress/compressors/bzip2/BlockSort.java | 92 ++-
.../commons/compress/compressors/bzip2/CRC.java | 4 +-
.../compressors/deflate64/HuffmanDecoder.java | 42 +-
.../gzip/GzipCompressorInputStream.java | 4 +-
.../gzip/GzipCompressorOutputStream.java | 7 +-
.../compress/compressors/gzip/GzipParameters.java | 26 +
.../lz4/BlockLZ4CompressorOutputStream.java | 15 +-
.../lz4/FramedLZ4CompressorOutputStream.java | 17 +-
.../AbstractLZ77CompressorInputStream.java | 2 +-
.../compressors/lz77support/LZ77Compressor.java | 10 +-
.../compress/compressors/lzma/LZMAUtils.java | 7 +-
.../pack200/Pack200CompressorOutputStream.java | 2 +-
.../compress/compressors/pack200/Pack200Utils.java | 9 +-
.../snappy/FramedSnappyCompressorInputStream.java | 3 +-
.../snappy/FramedSnappyCompressorOutputStream.java | 2 +-
.../snappy/SnappyCompressorInputStream.java | 4 +-
.../snappy/SnappyCompressorOutputStream.java | 2 +-
.../commons/compress/compressors/xz/XZUtils.java | 7 +-
.../compressors/z/ZCompressorInputStream.java | 22 +-
.../zstandard/ZstdCompressorInputStream.java | 17 +
.../compress/compressors/zstandard/ZstdUtils.java | 10 +-
.../commons/compress/utils/ArchiveUtils.java | 2 +-
.../commons/compress/utils/BitInputStream.java | 8 +-
.../compress/utils/BoundedArchiveInputStream.java | 97 +++
.../BoundedSeekableByteChannelInputStream.java | 57 ++
.../apache/commons/compress/utils/ByteUtils.java | 8 +
.../compress/utils/CountingOutputStream.java | 2 +-
.../utils/FixedLengthBlockOutputStream.java | 2 +-
.../org/apache/commons/compress/utils/IOUtils.java | 7 +-
.../utils/MultiReadOnlySeekableByteChannel.java | 2 +-
.../apache/commons/compress/utils/OsgiUtils.java | 58 ++
.../utils/SeekableInMemoryByteChannel.java | 6 +-
.../compress/utils/ServiceLoaderIterator.java | 14 +-
src/site/xdoc/examples.xml | 2 +-
.../apache/commons/compress/AbstractTestCase.java | 22 +-
.../apache/commons/compress/ArchiveReadTest.java | 18 +-
.../apache/commons/compress/ArchiveUtilsTest.java | 10 +-
.../apache/commons/compress/ChainingTestCase.java | 27 +-
.../commons/compress/DetectArchiverTestCase.java | 64 +-
.../org/apache/commons/compress/IOMethodsTest.java | 12 +-
.../org/apache/commons/compress/OsgiITest.java | 32 +-
.../commons/compress/archivers/ArTestCase.java | 71 +-
.../archivers/ArchiveOutputStreamTest.java | 10 +-
.../archivers/ArchiveStreamFactoryTest.java | 33 +-
.../commons/compress/archivers/CpioTestCase.java | 49 +-
.../commons/compress/archivers/DumpTestCase.java | 13 +-
.../compress/archivers/ExceptionMessageTest.java | 4 +-
.../commons/compress/archivers/JarTestCase.java | 21 +-
.../commons/compress/archivers/LongPathTest.java | 17 +-
.../compress/archivers/LongSymLinkTest.java | 17 +-
.../commons/compress/archivers/SevenZTestCase.java | 13 +-
.../commons/compress/archivers/TarTestCase.java | 328 +++++++--
.../commons/compress/archivers/ZipTestCase.java | 53 +-
.../archivers/ar/ArArchiveInputStreamTest.java | 29 +-
.../archivers/ar/ArArchiveOutputStreamTest.java | 10 +-
.../archivers/arj/ArjArchiveInputStreamTest.java | 16 +-
.../archivers/cpio/CpioArchiveInputStreamTest.java | 16 +-
.../cpio/CpioArchiveOutputStreamTest.java | 13 +-
.../compress/archivers/cpio/CpioArchiveTest.java | 6 +-
.../archivers/dump/DumpArchiveInputStreamTest.java | 15 +-
.../compress/archivers/examples/ExpanderTest.java | 36 +-
.../archivers/jar/JarArchiveOutputStreamTest.java | 8 +-
.../archivers/memory/MemoryArchiveInputStream.java | 7 +-
.../archivers/memory/MemoryArchiveTestCase.java | 4 +-
.../archivers/sevenz/AES256SHA256DecoderTest.java | 3 +-
.../compress/archivers/sevenz/SevenZFileTest.java | 31 +-
.../archivers/sevenz/SevenZNativeHeapTest.java | 7 +-
.../archivers/sevenz/SevenZOutputFileTest.java | 14 +-
.../commons/compress/archivers/tar/BigFilesIT.java | 82 +--
.../compress/archivers/tar/SparseFilesTest.java | 361 ++++++++--
.../archivers/tar/TarArchiveEntryTest.java | 81 ++-
.../archivers/tar/TarArchiveInputStreamTest.java | 170 +++--
.../archivers/tar/TarArchiveOutputStreamTest.java | 15 +-
.../compress/archivers/tar/TarFileTest.java | 365 ++++++++++
.../commons/compress/archivers/tar/TarLister.java | 10 +-
.../archivers/tar/TarMemoryFileSystemTest.java | 14 +-
.../compress/archivers/tar/TarUtilsTest.java | 418 +++++++++++-
.../compress/archivers/zip/AsiExtraFieldTest.java | 14 +-
.../compress/archivers/zip/BinaryTreeTest.java | 4 +-
.../compress/archivers/zip/BitStreamTest.java | 7 +-
.../compress/archivers/zip/CircularBufferTest.java | 4 +-
.../compress/archivers/zip/DataDescriptorTest.java | 13 +-
.../archivers/zip/EncryptedArchiveTest.java | 16 +-
.../compress/archivers/zip/ExplodeSupportTest.java | 8 +-
.../archivers/zip/ExtraFieldUtilsTest.java | 4 +-
.../archivers/zip/GeneralPurposeBitTest.java | 18 +-
.../commons/compress/archivers/zip/Lister.java | 21 +-
.../archivers/zip/Maven221MultiVolumeTest.java | 31 +-
.../zip/ParallelScatterZipCreatorTest.java | 134 +---
.../compress/archivers/zip/ScatterSample.java | 4 +-
.../compress/archivers/zip/ScatterSampleTest.java | 9 +-
.../archivers/zip/ScatterZipOutputStreamTest.java | 8 +-
.../compress/archivers/zip/UTF8ZipFilesTest.java | 41 +-
.../compress/archivers/zip/X000A_NTFSTest.java | 7 +-
.../archivers/zip/X5455_ExtendedTimestampTest.java | 58 +-
.../compress/archivers/zip/X7875_NewUnixTest.java | 55 +-
.../Zip64ExtendedInformationExtraFieldTest.java | 5 +-
.../compress/archivers/zip/Zip64SupportIT.java | 82 ++-
.../archivers/zip/ZipArchiveEntryTest.java | 26 +-
.../archivers/zip/ZipArchiveInputStreamTest.java | 144 ++--
.../archivers/zip/ZipEightByteIntegerTest.java | 19 +-
.../zip/ZipFileIgnoringLocalFileHeaderTest.java | 4 +-
.../compress/archivers/zip/ZipFileTest.java | 137 +++-
.../compress/archivers/zip/ZipLongTest.java | 20 +-
.../compress/archivers/zip/ZipShortTest.java | 16 +-
.../archivers/zip/ZipSplitOutputStreamTest.java | 8 +-
.../compress/archivers/zip/ZipUtilTest.java | 10 +-
.../compress/changes/ChangeSetTestCase.java | 162 +++--
.../compress/compressors/BZip2TestCase.java | 24 +-
.../compress/compressors/BZip2UtilsTestCase.java | 4 +-
.../compress/compressors/DeflateTestCase.java | 40 +-
.../compressors/DetectCompressorTestCase.java | 22 +-
.../compress/compressors/FramedSnappyTestCase.java | 68 +-
.../commons/compress/compressors/GZipTestCase.java | 76 ++-
.../compress/compressors/GzipUtilsTestCase.java | 4 +-
.../commons/compress/compressors/LZMATestCase.java | 28 +-
.../compress/compressors/Pack200TestCase.java | 27 +-
.../commons/compress/compressors/XZTestCase.java | 26 +-
.../commons/compress/compressors/ZTestCase.java | 46 +-
.../brotli/BrotliCompressorInputStreamTest.java | 31 +-
.../bzip2/BZip2CompressorInputStreamTest.java | 9 +-
.../bzip2/BZip2NSelectorsOverflowTest.java | 4 +-
.../bzip2/PythonTruncatedBzip2Test.java | 2 +-
.../deflate/DeflateCompressorInputStreamTest.java | 12 +-
.../Deflate64CompressorInputStreamTest.java | 58 +-
.../lz4/BlockLZ4CompressorInputStreamTest.java | 11 +-
.../lz4/BlockLZ4CompressorRoundtripTest.java | 19 +-
.../compress/compressors/lz4/FactoryTest.java | 11 +-
.../lz4/FramedLZ4CompressorInputStreamTest.java | 97 +--
.../lz4/FramedLZ4CompressorRoundtripTest.java | 41 +-
.../compress/compressors/lz4/XXHash32Test.java | 5 +-
.../AbstractLZ77CompressorInputStreamTest.java | 5 +-
.../lz77support/LZ77CompressorTest.java | 138 ++--
.../compressors/lzma/LZMAUtilsTestCase.java | 4 +-
.../compressors/pack200/Pack200UtilsTest.java | 16 +-
.../FramedSnappyCompressorInputStreamTest.java | 56 +-
.../compressors/snappy/SnappyRoundtripTest.java | 18 +-
.../xz/XZCompressorInputStreamTest.java | 7 +-
.../compress/compressors/xz/XZUtilsTestCase.java | 4 +-
.../compressors/z/ZCompressorInputStreamTest.java | 8 +-
.../zstandard/ZstdCompressorInputStreamTest.java | 65 +-
.../compressors/zstandard/ZstdRoundtripTest.java | 47 +-
.../commons/compress/utils/BitInputStreamTest.java | 8 +-
...BoundedSeekableByteChannelInputStreamTest.java} | 32 +-
.../commons/compress/utils/ByteUtilsTest.java | 31 +-
.../commons/compress/utils/CharsetsTest.java | 4 +-
.../utils/ChecksumCalculatingInputStreamTest.java | 8 +-
.../utils/FixedLengthBlockOutputStreamTest.java | 32 +-
.../apache/commons/compress/utils/IOUtilsTest.java | 53 +-
.../MultiReadOnlySeekableByteChannelTest.java | 12 +-
.../{CharsetsTest.java => OsgiUtilsTest.java} | 21 +-
.../utils/SeekableInMemoryByteChannelTest.java | 8 +-
.../ZipSplitReadOnlySeekableByteChannelTest.java | 4 +-
src/test/resources/COMPRESS-548.zip | Bin 0 -> 79 bytes
src/test/resources/COMPRESS-553.tar | Bin 0 -> 7168 bytes
src/test/resources/COMPRESS-554.tar | Bin 0 -> 10842 bytes
src/test/resources/COMPRESS-569.tar | Bin 0 -> 513 bytes
src/test/resources/directory.tar | Bin 0 -> 1536 bytes
241 files changed, 6342 insertions(+), 2943 deletions(-)
diff --cc .github/workflows/maven.yml
index 33afb05,06ffd72..2176e17
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@@ -40,9 -40,9 +40,10 @@@ jobs
restore-keys: |
${{ runner.os }}-maven-
- name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v1.4.1
+ uses: actions/setup-java@v2
with:
+ distribution: 'adopt'
java-version: ${{ matrix.java }}
- name: Build with Maven
- run: mvn -V --file pom.xml --no-transfer-progress
+ # TEMP -Ddoclint=none
+ run: mvn -V --file pom.xml --no-transfer-progress -Ddoclint=none
diff --cc pom.xml
index 0940702,3230613..ff22858
--- a/pom.xml
+++ b/pom.xml
@@@ -102,26 -109,10 +110,20 @@@ Brotli, Zstandard and ar, cpio, jar, ta
<dependency>
<groupId>org.tukaani</groupId>
<artifactId>xz</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
<optional>true</optional>
</dependency>
+
+ <!-- Pack200 -->
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.2</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- Test -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>