This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
commit 9b2e7874216392829f4feb261aefe1fa2deeb2e5
Merge: 09ab7d4 2840244
Author: Sebb <s...@apache.org>
AuthorDate: Thu Jun 18 12:15:45 2020 +0100
Merge branch 'master' of
https://gitbox.apache.org/repos/asf/commons-compress
.github/workflows/maven.yml | 35 +
.travis.yml | 6 +-
BUILDING.md | 6 +-
CONTRIBUTING.md | 2 +-
NOTICE.txt | 46 +-
README.md | 11 +-
RELEASE-NOTES.txt | 164 ++
pom.xml | 30 +-
src/changes/changes.xml | 218 +-
.../apache/commons/compress/archivers/Lister.java | 4 +-
.../archivers/ar/ArArchiveInputStream.java | 9 +-
.../archivers/ar/ArArchiveOutputStream.java | 3 +-
.../commons/compress/archivers/ar/package.html | 8 +-
.../archivers/arj/ArjArchiveInputStream.java | 3 +
.../commons/compress/archivers/arj/package.html | 6 +-
.../compress/archivers/cpio/CpioArchiveEntry.java | 4 +-
.../archivers/cpio/CpioArchiveInputStream.java | 18 +-
.../archivers/cpio/CpioArchiveOutputStream.java | 6 +-
.../compress/archivers/cpio/CpioConstants.java | 2 +-
.../commons/compress/archivers/cpio/CpioUtil.java | 2 +-
.../commons/compress/archivers/cpio/package.html | 6 +-
.../archivers/dump/DumpArchiveInputStream.java | 3 +
.../compress/archivers/dump/TapeInputStream.java | 3 +
.../commons/compress/archivers/dump/package.html | 12 +-
.../compress/archivers/examples/Archiver.java | 6 +
.../archivers/examples/CloseableConsumer.java | 5 +
.../examples/CloseableConsumerAdapter.java | 6 +-
.../compress/archivers/examples/package.html | 6 +-
.../commons/compress/archivers/jar/package.html | 6 +-
.../apache/commons/compress/archivers/package.html | 6 +-
.../commons/compress/archivers/sevenz/Archive.java | 6 +-
.../BoundedSeekableByteChannelInputStream.java | 14 +
.../commons/compress/archivers/sevenz/CLI.java | 42 +-
.../commons/compress/archivers/sevenz/Folder.java | 2 +-
.../compress/archivers/sevenz/SevenZFile.java | 508 ++--
.../archivers/sevenz/SevenZFileOptions.java | 120 +
.../sevenz/SevenZMethodConfiguration.java | 3 +-
.../archivers/sevenz/SevenZOutputFile.java | 6 +-
.../commons/compress/archivers/sevenz/package.html | 6 +-
.../compress/archivers/tar/TarArchiveEntry.java | 246 +-
.../archivers/tar/TarArchiveInputStream.java | 482 +++-
.../archivers/tar/TarArchiveOutputStream.java | 21 +-
.../archivers/tar/TarArchiveSparseEntry.java | 24 +
.../archivers/tar/TarArchiveStructSparse.java | 77 +
.../compress/archivers/tar/TarConstants.java | 24 +
.../commons/compress/archivers/tar/TarUtils.java | 22 +-
.../commons/compress/archivers/tar/package.html | 10 +-
.../archivers/zip/AbstractUnicodeExtraField.java | 12 +-
.../commons/compress/archivers/zip/BinaryTree.java | 8 +-
.../archivers/zip/ExplodingInputStream.java | 21 +-
.../archivers/zip/ExtraFieldParsingBehavior.java | 5 +-
.../compress/archivers/zip/ExtraFieldUtils.java | 30 +-
.../compress/archivers/zip/GeneralPurposeBit.java | 2 +-
.../compress/archivers/zip/NioZipEncoding.java | 5 +-
.../archivers/zip/ParallelScatterZipCreator.java | 67 +-
.../zip/X0017_StrongEncryptionHeader.java | 14 +-
.../archivers/zip/X5455_ExtendedTimestamp.java | 10 +-
.../archivers/zip/Zip64RequiredException.java | 12 +
.../compress/archivers/zip/ZipArchiveEntry.java | 114 +-
.../archivers/zip/ZipArchiveEntryRequest.java | 4 +-
.../archivers/zip/ZipArchiveInputStream.java | 123 +-
.../archivers/zip/ZipArchiveOutputStream.java | 318 ++-
.../archivers/zip/ZipEightByteInteger.java | 2 +-
.../compress/archivers/zip/ZipEncodingHelper.java | 2 +-
.../commons/compress/archivers/zip/ZipFile.java | 185 +-
.../commons/compress/archivers/zip/ZipLong.java | 4 +-
.../commons/compress/archivers/zip/ZipShort.java | 4 +-
.../archivers/zip/ZipSplitOutputStream.java | 245 ++
.../zip/ZipSplitReadOnlySeekableByteChannel.java | 254 ++
.../commons/compress/archivers/zip/ZipUtil.java | 2 +-
.../commons/compress/archivers/zip/package.html | 6 +-
.../apache/commons/compress/changes/Change.java | 20 +-
.../apache/commons/compress/changes/package.html | 8 +-
.../compressors/CompressorStreamFactory.java | 14 +-
.../commons/compress/compressors/FileNameUtil.java | 1 -
.../brotli/BrotliCompressorInputStream.java | 4 +-
.../compress/compressors/brotli/package.html | 6 +-
.../bzip2/BZip2CompressorInputStream.java | 25 +-
.../bzip2/BZip2CompressorOutputStream.java | 66 +-
.../compress/compressors/bzip2/BZip2Utils.java | 4 +-
.../compress/compressors/bzip2/BlockSort.java | 1 -
.../commons/compress/compressors/bzip2/CRC.java | 2 +-
.../compress/compressors/bzip2/package.html | 6 +-
.../deflate/DeflateCompressorInputStream.java | 3 +
.../compress/compressors/deflate/package.html | 6 +-
.../deflate64/Deflate64CompressorInputStream.java | 13 +-
.../compressors/deflate64/HuffmanDecoder.java | 23 +-
.../compress/compressors/deflate64/package.html | 6 +-
.../gzip/GzipCompressorInputStream.java | 12 +-
.../gzip/GzipCompressorOutputStream.java | 6 +-
.../commons/compress/compressors/gzip/package.html | 6 +-
.../lz4/BlockLZ4CompressorInputStream.java | 3 +
.../lz4/FramedLZ4CompressorInputStream.java | 25 +-
.../commons/compress/compressors/lz4/package.html | 6 +-
.../compressors/lz77support/LZ77Compressor.java | 12 +-
.../compressors/lz77support/Parameters.java | 4 +-
.../compress/compressors/lz77support/package.html | 6 +-
.../commons/compress/compressors/lzma/package.html | 6 +-
.../compress/compressors/lzw/LZWInputStream.java | 3 +
.../commons/compress/compressors/lzw/package.html | 6 +-
.../pack200/Pack200CompressorInputStream.java | 16 +-
.../compress/compressors/pack200/Pack200Utils.java | 8 +-
.../pack200/TempFileCachingStreamBridge.java | 3 +-
.../compress/compressors/pack200/package.html | 6 +-
.../commons/compress/compressors/package.html | 6 +-
.../snappy/FramedSnappyCompressorInputStream.java | 25 +-
.../compressors/snappy/PureJavaCrc32C.java | 2 +-
.../snappy/SnappyCompressorInputStream.java | 3 +
.../compress/compressors/snappy/package.html | 6 +-
.../compressors/xz/XZCompressorInputStream.java | 3 +
.../commons/compress/compressors/xz/package.html | 6 +-
.../commons/compress/compressors/z/package.html | 6 +-
.../zstandard/ZstdCompressorInputStream.java | 7 +-
.../zstandard/ZstdCompressorOutputStream.java | 7 +-
.../compress/compressors/zstandard/package.html | 6 +-
.../apache/commons/compress/parallel/package.html | 6 +-
.../commons/compress/utils/ArchiveUtils.java | 32 +-
.../commons/compress/utils/BoundedInputStream.java | 23 +
.../apache/commons/compress/utils/Charsets.java | 6 +
.../utils/ChecksumCalculatingInputStream.java | 17 +-
.../utils/ChecksumVerifyingInputStream.java | 11 +
.../compress/utils/CountingInputStream.java | 8 +-
.../commons/compress/utils/FileNameUtils.java | 78 +
.../utils/FixedLengthBlockOutputStream.java | 2 +-
.../org/apache/commons/compress/utils/IOUtils.java | 35 +-
.../utils/MultiReadOnlySeekableByteChannel.java | 254 ++
.../utils/SeekableInMemoryByteChannel.java | 40 +-
.../compress/utils/SkipShieldingInputStream.java | 2 +-
.../org/apache/commons/compress/utils/package.html | 6 +-
src/site/site.xml | 2 +
src/site/xdoc/conventions.xml | 2 +-
src/site/xdoc/download_compress.xml | 44 +-
src/site/xdoc/examples.xml | 25 +-
src/site/xdoc/index.xml | 158 +-
src/site/xdoc/issue-tracking.xml | 2 +-
src/site/xdoc/limitations.xml | 27 +-
src/site/xdoc/mail-lists.xml | 8 +-
src/site/xdoc/security-reports.xml | 22 +-
src/site/xdoc/zip.xml | 72 +-
.../apache/commons/compress/AbstractTestCase.java | 10 +-
.../org/apache/commons/compress/OsgiITest.java | 25 +
.../commons/compress/archivers/SevenZTestCase.java | 1 +
.../commons/compress/archivers/TarTestCase.java | 9 +-
.../commons/compress/archivers/ZipTestCase.java | 310 ++-
.../archivers/ar/ArArchiveInputStreamTest.java | 23 +-
.../archivers/arj/ArjArchiveInputStreamTest.java | 61 +-
.../archivers/cpio/CpioArchiveInputStreamTest.java | 51 +-
.../compress/archivers/examples/ExpanderTest.java | 4 -
.../examples/ParameterizedExpanderTest.java | 1 -
.../compress/archivers/sevenz/SevenZFileTest.java | 456 +++-
.../archivers/sevenz/SevenZNativeHeapTest.java | 29 +-
.../archivers/sevenz/SevenZOutputFileTest.java | 14 +-
.../compress/archivers/tar/SparseFilesTest.java | 179 +-
.../archivers/tar/TarArchiveEntryTest.java | 43 +-
.../archivers/tar/TarArchiveInputStreamTest.java | 89 +-
.../archivers/tar/TarArchiveOutputStreamTest.java | 43 +-
.../archivers/tar/TarMemoryFileSystemTest.java | 122 +
.../compress/archivers/tar/TarUtilsTest.java | 30 +-
.../compress/archivers/zip/DataDescriptorTest.java | 7 +-
.../compress/archivers/zip/NioZipEncodingTest.java | 97 +
.../zip/ParallelScatterZipCreatorTest.java | 218 +-
.../compress/archivers/zip/ScatterSampleTest.java | 27 +-
.../compress/archivers/zip/UTF8ZipFilesTest.java | 13 +-
.../archivers/zip/X5455_ExtendedTimestampTest.java | 12 +-
.../compress/archivers/zip/Zip64SupportIT.java | 104 +-
.../archivers/zip/ZipArchiveEntryTest.java | 73 +-
.../archivers/zip/ZipArchiveInputStreamTest.java | 233 ++
.../compress/archivers/zip/ZipEncodingTest.java | 2 +-
.../compress/archivers/zip/ZipFileTest.java | 127 +-
.../archivers/zip/ZipSplitOutputStreamTest.java | 104 +
.../compress/archivers/zip/ZipUtilTest.java | 32 +
.../CompressorStreamFactoryRoundtripTest.java | 3 +-
.../compressors/DetectCompressorTestCase.java | 2 +-
.../brotli/BrotliCompressorInputStreamTest.java | 7 +-
.../bzip2/BZip2CompressorInputStreamTest.java | 60 +
.../bzip2/BZip2NSelectorsOverflowTest.java | 47 +
.../bzip2/PythonTruncatedBzip2Test.java | 2 +-
.../Deflate64CompressorInputStreamTest.java | 114 +
.../compressors/deflate64/HuffmanDecoderTest.java | 3 -
.../lz4/FramedLZ4CompressorInputStreamTest.java | 5 +-
.../lz77support/LZ77CompressorTest.java | 53 +-
.../FramedSnappyCompressorInputStreamTest.java | 5 +-
.../compressors/z/ZCompressorInputStreamTest.java | 24 +-
.../zstandard/ZstdCompressorInputStreamTest.java | 4 +-
.../commons/compress/utils/CharsetsTest.java | 2 +
.../commons/compress/utils/FileNameUtilsTest.java | 53 +
.../utils/FixedLengthBlockOutputStreamTest.java | 6 +-
.../MultiReadOnlySeekableByteChannelTest.java | 387 +++
.../utils/SeekableInMemoryByteChannelTest.java | 231 +-
.../ZipSplitReadOnlySeekableByteChannelTest.java | 181 ++
.../split_zip_created_by_winrar/file_to_compare_1} | 2575 ++++++++++----------
.../split_zip_created_by_winrar.z01 | Bin 0 -> 262144 bytes
.../split_zip_created_by_winrar.z02 | Bin 0 -> 262144 bytes
.../split_zip_created_by_winrar.zip | Bin 0 -> 50536 bytes
.../zip_to_compare_created_by_winrar.zip | Bin 0 -> 574820 bytes
.../split_zip_created_by_zip/file_to_compare_1} | 34 +-
.../split_zip_created_by_zip/file_to_compare_2 | 79 +
.../split_zip_created_by_zip.z01 | Bin 0 -> 262144 bytes
.../split_zip_created_by_zip.z02 | Bin 0 -> 262144 bytes
.../split_zip_created_by_zip.zip | Bin 0 -> 57763 bytes
.../split_zip_created_by_zip_zip64.z01 | Bin 0 -> 262144 bytes
.../split_zip_created_by_zip_zip64.z02 | Bin 0 -> 262144 bytes
.../split_zip_created_by_zip_zip64.zip | Bin 0 -> 69177 bytes
.../zip_to_compare_created_by_zip.zip | Bin 0 -> 582047 bytes
.../zip_to_compare_created_by_zip_zip64.zip | Bin 0 -> 584681 bytes
src/test/resources/COMPRESS-492.7z | Bin 0 -> 39 bytes
src/test/resources/COMPRESS-529.tar | Bin 0 -> 1536 bytes
src/test/resources/COMPRESS-530.tar | Bin 0 -> 525 bytes
src/test/resources/bla-multi.7z.001 | Bin 0 -> 512 bytes
src/test/resources/bla-multi.7z.002 | Bin 0 -> 7 bytes
src/test/resources/bla-nonames.7z | Bin 0 -> 556 bytes
.../bla-stored-dd-contradicts-actualsize.zip | Bin 0 -> 1023 bytes
src/test/resources/bla-stored-dd-nosig.zip | Bin 0 -> 1018 bytes
src/test/resources/bla-stored-dd-sizes-differ.zip | Bin 0 -> 1022 bytes
src/test/resources/bla-stored-dd.zip | Bin 0 -> 1022 bytes
src/test/resources/bla-stored.zip | Bin 0 -> 1006 bytes
src/test/resources/bla.noendheaderoffset.7z | Bin 0 -> 512 bytes
src/test/resources/lbzip2_32767.bz2 | Bin 0 -> 4140 bytes
src/test/resources/oldgnu_extended_sparse.tar | Bin 0 -> 10240 bytes
219 files changed, 8914 insertions(+), 2511 deletions(-)
diff --cc pom.xml
index 693e94e,a5194ca..356ff24
--- a/pom.xml
+++ b/pom.xml
@@@ -24,10 -24,9 +24,10 @@@
</parent>
<artifactId>commons-compress</artifactId>
- <version>1.19-SNAPSHOT</version>
+ <version>1.21-SNAPSHOT</version>
<name>Apache Commons Compress</name>
<url>https://commons.apache.org/proper/commons-compress/</url>
+ <inceptionYear>2002</inceptionYear> <!-- from NOTICE file -->
<!-- The description is not indented to make it look better in the release
notes -->
<description>
Apache Commons Compress software defines an API for working with
