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 2020/09/06 01:44:00 UTC
[commons-io] 01/01: Merge from master and resolve conflicts.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit 01f92b184933bf8f333676f0b872cecb8e23466d
Merge: 9c2a9c1 dcdd277
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Sep 5 21:43:44 2020 -0400
Merge from master and resolve conflicts.
.github/{workflows/maven.yml => dependabot.yml} | 30 +-
.github/workflows/maven.yml | 29 +-
.gitignore | 3 +
.travis.yml | 9 +-
README.md | 4 +-
RELEASE-NOTES.txt | 108 +++
SECURITY.md | 59 ++
checkstyle.xml | 8 +-
findbugs-exclude-filter.xml | 95 --
pom.xml | 50 +-
spotbugs-exclude-filter.xml | 40 +
src/changes/changes.xml | 126 +++
src/changes/release-notes.vm | 12 +
.../org/apache/commons/io/ByteOrderParser.java | 2 +-
src/main/java/org/apache/commons/io/Charsets.java | 25 +-
.../java/org/apache/commons/io/FileSystem.java | 4 +-
src/main/java/org/apache/commons/io/FileUtils.java | 518 ++++++++---
.../org/apache/commons/io/IOExceptionList.java | 4 +-
.../org/apache/commons/io/IOIndexedException.java | 2 +-
src/main/java/org/apache/commons/io/IOUtils.java | 263 +++---
.../org/apache/commons/io/TaggedIOException.java | 4 +-
.../io/comparator/AbstractFileComparator.java | 8 +-
.../io/comparator/DefaultFileComparator.java | 2 +-
.../io/comparator/DirectoryFileComparator.java | 2 +-
.../io/comparator/ExtensionFileComparator.java | 6 +-
.../io/comparator/LastModifiedFileComparator.java | 20 +-
.../commons/io/comparator/NameFileComparator.java | 6 +-
.../commons/io/comparator/PathFileComparator.java | 6 +-
...eComparator.java => ReverseFileComparator.java} | 23 +-
.../commons/io/comparator/SizeFileComparator.java | 8 +-
.../commons/io/file/AccumulatorPathVisitor.java | 20 +-
.../commons/io/file/CleaningPathVisitor.java | 48 +-
.../commons/io/file/CopyDirectoryVisitor.java | 75 +-
.../java/org/apache/commons/io/file/Counters.java | 12 +-
.../commons/io/file/CountingPathVisitor.java | 4 +-
.../package-info.java => file/DeleteOption.java} | 17 +-
.../commons/io/file/DeletingPathVisitor.java | 49 +-
.../java/org/apache/commons/io/file/PathUtils.java | 280 ++++--
.../commons/io/file/StandardDeleteOption.java | 52 ++
.../commons/io/filefilter/AgeFileFilter.java | 1 +
.../commons/io/filefilter/FileFilterUtils.java | 4 +-
.../commons/io/filefilter/SizeFileFilter.java | 7 +-
.../org/apache/commons/io/function/IOConsumer.java | 4 +-
.../org/apache/commons/io/function/IOFunction.java | 20 +-
.../org/apache/commons/io/function/package.html | 2 +-
.../io/input/AbstractCharacterFilterReader.java | 2 +-
.../apache/commons/io/input/BOMInputStream.java | 12 +-
.../commons/io/input/CharSequenceInputStream.java | 2 +-
.../commons/io/input/CharSequenceReader.java | 14 +-
.../commons/io/input/CircularInputStream.java | 85 ++
.../apache/commons/io/input/CloseShieldReader.java | 2 +-
.../apache/commons/io/input/ClosedInputStream.java | 1 +
.../commons/io/input/CountingInputStream.java | 2 +-
.../apache/commons/io/input/DemuxInputStream.java | 5 +-
.../io/input/InfiniteCircularInputStream.java | 30 +-
.../commons/io/input/MarkShieldInputStream.java | 64 ++
.../input/MessageDigestCalculatingInputStream.java | 4 +-
.../commons/io/input/ObservableInputStream.java | 14 +-
.../apache/commons/io/input/ProxyInputStream.java | 5 +-
.../org/apache/commons/io/input/ProxyReader.java | 2 +-
.../io/input/RandomAccessFileInputStream.java | 151 ++++
.../apache/commons/io/input/ReaderInputStream.java | 2 +
.../commons/io/input/ReversedLinesFileReader.java | 561 ++++++------
.../commons/io/input/SwappedDataInputStream.java | 1 +
.../java/org/apache/commons/io/input/Tailer.java | 15 +-
.../org/apache/commons/io/input/TeeReader.java | 2 +-
.../input/UnsynchronizedByteArrayInputStream.java | 3 +
.../apache/commons/io/input/XmlStreamReader.java | 26 +-
.../commons/io/input/XmlStreamReaderException.java | 3 +
.../io/input/buffer/CircularBufferInputStream.java | 2 +-
.../io/input/buffer/CircularByteBuffer.java | 4 +-
.../io/{function => input/buffer}/package.html | 3 +-
.../io/output/AbstractByteArrayOutputStream.java | 4 +-
.../io/output/DeferredFileOutputStream.java | 2 +-
.../commons/io/output/FileWriterWithEncoding.java | 2 +-
.../commons/io/output/FilterCollectionWriter.java | 2 +-
.../commons/io/output/LockableFileWriter.java | 2 +-
.../{NullPrintStream.java => NullAppendable.java} | 38 +-
.../apache/commons/io/output/NullOutputStream.java | 5 +-
.../apache/commons/io/output/NullPrintStream.java | 4 +-
.../org/apache/commons/io/output/NullWriter.java | 7 +-
.../commons/io/output/ProxyOutputStream.java | 2 +-
.../org/apache/commons/io/output/ProxyWriter.java | 2 +-
src/site/site.xml | 10 +-
src/site/xdoc/bestpractices.xml | 2 +-
src/site/xdoc/description.xml | 24 +-
src/site/xdoc/download_io.xml | 26 +-
src/site/xdoc/index.xml | 79 +-
.../org/apache/commons/io/CharsetsTestCase.java | 1 -
.../java/org/apache/commons/io/CopyUtilsTest.java | 30 +-
.../java/org/apache/commons/io/DemuxTestCase.java | 2 +-
.../commons/io/FileCleaningTrackerTestCase.java | 2 +-
.../commons/io/FileDeleteStrategyTestCase.java | 2 +-
.../org/apache/commons/io/FileSystemTestCase.java | 15 +
.../io/FileUtilsCleanDirectoryTestCase.java | 25 +-
.../commons/io/FileUtilsCleanSymlinksTestCase.java | 24 +-
.../FileUtilsCopyDirectoryToDirectoryTestCase.java | 77 +-
.../commons/io/FileUtilsCopyToFileTestCase.java | 3 +-
.../commons/io/FileUtilsFileNewerTestCase.java | 14 +-
.../org/apache/commons/io/FileUtilsTestCase.java | 365 +++++---
.../apache/commons/io/FilenameUtilsTestCase.java | 2 +-
.../apache/commons/io/IOExceptionListTestCase.java | 9 +-
.../org/apache/commons/io/IOUtilsCopyTestCase.java | 68 +-
.../org/apache/commons/io/IOUtilsTestCase.java | 989 ++++++++++-----------
.../apache/commons/io/IOUtilsWriteTestCase.java | 86 +-
.../apache/commons/io/LineIteratorTestCase.java | 79 +-
.../java/org/apache/commons/io/TestResources.java | 53 ++
.../apache/commons/io/ThreadMonitorTestCase.java | 2 +-
.../io/comparator/ComparatorAbstractTestCase.java | 2 +-
.../io/comparator/CompositeFileComparatorTest.java | 4 +-
.../comparator/LastModifiedFileComparatorTest.java | 2 +-
.../io/comparator/SizeFileComparatorTest.java | 2 +-
.../commons/io/file/CleaningPathVisitorTest.java | 2 +-
.../commons/io/file/CopyDirectoryVisitorTest.java | 2 +-
.../apache/commons/io/file/CounterAssertions.java | 2 +-
.../commons/io/file/CountingPathVisitorTest.java | 2 +-
.../commons/io/file/DeletingPathVisitorTest.java | 2 +-
.../io/file/PathUtilsCleanDirectoryTest.java | 2 +-
.../commons/io/file/PathUtilsCountingTest.java | 2 +-
.../io/file/PathUtilsDeleteDirectoryTest.java | 23 +-
.../commons/io/file/PathUtilsDeleteFileTest.java | 50 +-
.../commons/io/file/PathUtilsDeleteTest.java | 118 ++-
.../commons/io/filefilter/FileFilterTestCase.java | 6 +-
.../apache/commons/io/function/IOFunctionTest.java | 12 +-
.../apache/commons/io/input/BoundedReaderTest.java | 17 +-
.../commons/io/input/CharSequenceReaderTest.java | 52 +-
.../io/input/CharacterFilterReaderTest.java | 22 +
...treamTest.java => CircularInputStreamTest.java} | 77 +-
.../commons/io/input/CountingInputStreamTest.java | 11 +-
.../io/input/InfiniteCircularInputStreamTest.java | 68 +-
.../io/input/MarkShieldInputStreamTest.java | 113 +++
.../commons/io/input/NullInputStreamTest.java | 3 +-
.../apache/commons/io/input/NullReaderTest.java | 1 +
.../io/input/ObservableInputStreamTest.java | 76 +-
.../io/input/RandomAccessFileInputStreamTest.java | 180 ++++
.../commons/io/input/ReaderInputStreamTest.java | 17 +-
.../ReversedLinesFileReaderTestParamBlockSize.java | 76 +-
.../ReversedLinesFileReaderTestParamFile.java | 88 +-
.../input/ReversedLinesFileReaderTestSimple.java | 63 +-
.../commons/io/input/SequenceReaderTest.java | 14 +-
.../io/input/SwappedDataInputStreamTest.java | 22 +-
.../org/apache/commons/io/input/TailerTest.java | 31 +-
.../commons/io/input/TeeInputStreamTest.java | 8 +-
.../org/apache/commons/io/input/TeeReaderTest.java | 8 +-
.../UnsynchronizedByteArrayInputStreamTest.java | 19 +-
.../commons/io/input/XmlStreamReaderTest.java | 8 +-
.../buffer/CircularBufferInputStreamTest.java | 26 +-
.../io/input/compatibility/XmlStreamReader.java | 5 +-
.../io/monitor/AbstractMonitorTestCase.java | 2 +-
.../io/monitor/FileAlterationMonitorTestCase.java | 2 +-
.../io/output/ByteArrayOutputStreamTestCase.java | 315 ++++---
.../io/output/CountingOutputStreamTest.java | 12 +-
.../io/output/DeferredFileOutputStreamTest.java | 20 +-
.../io/output/FileWriterWithEncodingTest.java | 126 +--
.../commons/io/output/LockableFileWriterTest.java | 4 +-
.../commons/io/output/NullAppendableTest.java} | 23 +-
.../io/output/ProxyCollectionWriterTest.java | 23 +
.../apache/commons/io/output/ProxyWriterTest.java | 2 +-
.../commons/io/output/TeeOutputStreamTest.java | 6 +-
.../apache/commons/io/output/TeeWriterTest.java | 3 +
.../ValidatingObjectInputStreamTest.java | 2 +-
.../commons/io/{testtools => test}/TestUtils.java | 17 +-
.../ThrowOnCloseInputStream.java} | 8 +-
.../ThrowOnCloseOutputStream.java} | 8 +-
.../ThrowOnCloseReader.java} | 8 +-
.../ThrowOnCloseWriter.java} | 8 +-
.../ThrowOnFlushAndCloseOutputStream.java} | 27 +-
.../commons/io/{input => }/CharSequenceReader.bin | Bin
.../resources/org/apache/commons/io/io639-1.bin | 2 +
.../resources/org/apache/commons/io/io639-2.bin | 2 +
.../resources/org/apache/commons/io/io639-3.bin | 3 +
.../resources/org/apache/commons/io/io639-4.bin | 2 +
.../resources/org/apache/commons/io/io639-5.bin | 1 +
.../apache/commons/io}/test-file-20byteslength.bin | 2 +-
.../apache/commons/io}/test-file-empty.bin | 0
.../{ => org/apache/commons/io}/test-file-gbk.bin | 0
.../test-file-iso8859-1-shortlines-win-linebr.bin | 0
.../apache/commons/io}/test-file-iso8859-1.bin | 0
.../apache/commons/io}/test-file-shiftjis.bin | 0
.../apache/commons/io}/test-file-simple-utf8.bin | 0
.../apache/commons/io}/test-file-utf16be.bin | Bin
.../apache/commons/io}/test-file-utf16le.bin | Bin
.../apache/commons/io}/test-file-utf8-cr-only.bin | 0
.../commons/io}/test-file-utf8-win-linebr.bin | 0
.../{ => org/apache/commons/io}/test-file-utf8.bin | 0
.../apache/commons/io}/test-file-windows-31j.bin | 0
.../apache/commons/io}/test-file-x-windows-949.bin | 0
.../apache/commons/io}/test-file-x-windows-950.bin | 0
188 files changed, 4604 insertions(+), 2409 deletions(-)