This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository commons-io.
commit 186c9fec4769753b9bd055529c1541740a1a3547 Merge: 829ab46 7ce9f9a Author: Markus Koschany <a...@debian.org> Date: Wed Jan 17 22:32:24 2018 +0100 Update upstream source from tag 'upstream/2.6' Update to upstream version '2.6' with Debian dir 8b8bde88d59cb1e86cbe09a62bb397317a93302e NOTICE.txt | 2 +- RELEASE-NOTES.txt | 133 ++++- build.xml | 355 -------------- checkstyle.xml | 4 - pom.xml | 126 +++-- src/assembly/src.xml | 1 - src/changes/changes.xml | 90 +++- .../java/org/apache/commons/io/ByteOrderMark.java | 2 +- .../org/apache/commons/io/ByteOrderParser.java | 66 +++ src/main/java/org/apache/commons/io/Charsets.java | 384 +++++++-------- src/main/java/org/apache/commons/io/CopyUtils.java | 5 +- .../org/apache/commons/io/DirectoryWalker.java | 6 +- .../java/org/apache/commons/io/EndianUtils.java | 9 +- .../java/org/apache/commons/io/FileCleaner.java | 15 +- .../org/apache/commons/io/FileCleaningTracker.java | 13 +- .../org/apache/commons/io/FileDeleteStrategy.java | 7 +- .../org/apache/commons/io/FileExistsException.java | 7 +- .../org/apache/commons/io/FileSystemUtils.java | 65 ++- src/main/java/org/apache/commons/io/FileUtils.java | 317 ++++++------ .../java/org/apache/commons/io/FilenameUtils.java | 25 +- src/main/java/org/apache/commons/io/HexDump.java | 1 - src/main/java/org/apache/commons/io/IOCase.java | 5 +- .../apache/commons/io/IOExceptionWithCause.java | 11 +- src/main/java/org/apache/commons/io/IOUtils.java | 248 ++++++++-- .../java/org/apache/commons/io/Java7Support.java | 190 ------- .../java/org/apache/commons/io/LineIterator.java | 42 +- .../org/apache/commons/io/TaggedIOException.java | 6 +- .../java/org/apache/commons/io/ThreadMonitor.java | 10 +- .../io/comparator/AbstractFileComparator.java | 5 +- .../io/comparator/CompositeFileComparator.java | 10 +- .../io/comparator/DefaultFileComparator.java | 8 +- .../io/comparator/DirectoryFileComparator.java | 8 +- .../io/comparator/ExtensionFileComparator.java | 10 +- .../io/comparator/LastModifiedFileComparator.java | 12 +- .../commons/io/comparator/NameFileComparator.java | 8 +- .../commons/io/comparator/PathFileComparator.java | 10 +- .../commons/io/comparator/ReverseComparator.java | 10 +- .../commons/io/comparator/SizeFileComparator.java | 12 +- .../org/apache/commons/io/comparator/package.html | 260 +++++----- .../commons/io/filefilter/AbstractFileFilter.java | 18 +- .../commons/io/filefilter/AgeFileFilter.java | 13 +- .../commons/io/filefilter/AndFileFilter.java | 22 +- .../commons/io/filefilter/CanReadFileFilter.java | 4 +- .../commons/io/filefilter/CanWriteFileFilter.java | 4 +- .../io/filefilter/ConditionalFileFilter.java | 6 +- .../commons/io/filefilter/DelegateFileFilter.java | 6 +- .../commons/io/filefilter/DirectoryFileFilter.java | 10 +- .../commons/io/filefilter/EmptyFileFilter.java | 4 +- .../commons/io/filefilter/FalseFileFilter.java | 10 +- .../commons/io/filefilter/FileFileFilter.java | 8 +- .../commons/io/filefilter/FileFilterUtils.java | 24 +- .../commons/io/filefilter/HiddenFileFilter.java | 4 +- .../apache/commons/io/filefilter/IOFileFilter.java | 4 +- .../io/filefilter/MagicNumberFileFilter.java | 23 +- .../commons/io/filefilter/NameFileFilter.java | 6 +- .../commons/io/filefilter/NotFileFilter.java | 6 +- .../apache/commons/io/filefilter/OrFileFilter.java | 24 +- .../commons/io/filefilter/PrefixFileFilter.java | 6 +- .../commons/io/filefilter/RegexFileFilter.java | 5 +- .../commons/io/filefilter/SizeFileFilter.java | 11 +- .../commons/io/filefilter/SuffixFileFilter.java | 10 +- .../commons/io/filefilter/TrueFileFilter.java | 8 +- .../commons/io/filefilter/WildcardFileFilter.java | 5 +- .../commons/io/filefilter/WildcardFilter.java | 5 +- .../org/apache/commons/io/filefilter/package.html | 8 +- .../commons/io/input/AutoCloseInputStream.java | 5 +- .../apache/commons/io/input/BOMInputStream.java | 78 +-- .../commons/io/input/BoundedInputStream.java | 3 +- .../org/apache/commons/io/input/BoundedReader.java | 20 +- .../apache/commons/io/input/BrokenInputStream.java | 4 +- .../commons/io/input/CharSequenceReader.java | 7 +- .../io/input/ClassLoaderObjectInputStream.java | 3 +- .../commons/io/input/CloseShieldInputStream.java | 5 +- .../apache/commons/io/input/ClosedInputStream.java | 1 - .../commons/io/input/CountingInputStream.java | 13 +- .../apache/commons/io/input/DemuxInputStream.java | 7 +- ...tream.java => InfiniteCircularInputStream.java} | 35 +- .../input/MessageDigestCalculatingInputStream.java | 102 ++++ .../apache/commons/io/input/NullInputStream.java | 6 +- .../org/apache/commons/io/input/NullReader.java | 6 +- .../commons/io/input/ObservableInputStream.java | 266 ++++++++++ .../apache/commons/io/input/ProxyInputStream.java | 1 - .../org/apache/commons/io/input/ProxyReader.java | 17 +- .../apache/commons/io/input/ReaderInputStream.java | 2 +- .../commons/io/input/ReversedLinesFileReader.java | 15 +- .../commons/io/input/SwappedDataInputStream.java | 44 +- .../apache/commons/io/input/TaggedInputStream.java | 6 +- .../java/org/apache/commons/io/input/Tailer.java | 123 +++-- .../apache/commons/io/input/TailerListener.java | 1 - .../commons/io/input/TailerListenerAdapter.java | 6 +- .../apache/commons/io/input/TeeInputStream.java | 12 +- .../io/input/UnixLineEndingInputStream.java | 10 +- .../io/input/WindowsLineEndingInputStream.java | 8 +- .../apache/commons/io/input/XmlStreamReader.java | 11 +- .../commons/io/input/XmlStreamReaderException.java | 1 - .../commons/io/monitor/FileAlterationListener.java | 16 +- .../io/monitor/FileAlterationListenerAdaptor.java | 24 +- .../commons/io/monitor/FileAlterationMonitor.java | 13 +- .../commons/io/monitor/FileAlterationObserver.java | 14 +- .../org/apache/commons/io/monitor/FileEntry.java | 2 +- .../commons/io/output/AppendableOutputStream.java | 6 +- .../commons/io/output/BrokenOutputStream.java | 4 +- .../commons/io/output/ByteArrayOutputStream.java | 21 +- .../commons/io/output/ChunkedOutputStream.java | 12 +- .../apache/commons/io/output/ChunkedWriter.java | 10 +- .../commons/io/output/CloseShieldOutputStream.java | 6 +- .../commons/io/output/ClosedOutputStream.java | 10 +- .../commons/io/output/CountingOutputStream.java | 15 +- .../io/output/DeferredFileOutputStream.java | 87 +++- .../commons/io/output/DemuxOutputStream.java | 7 +- .../commons/io/output/FileWriterWithEncoding.java | 35 +- .../commons/io/output/LockableFileWriter.java | 23 +- .../apache/commons/io/output/NullOutputStream.java | 2 +- .../org/apache/commons/io/output/NullWriter.java | 1 - .../commons/io/output/ProxyOutputStream.java | 13 +- .../org/apache/commons/io/output/ProxyWriter.java | 15 +- .../commons/io/output/StringBuilderWriter.java | 13 +- .../commons/io/output/TaggedOutputStream.java | 4 +- .../apache/commons/io/output/TeeOutputStream.java | 15 +- .../io/output/ThresholdingOutputStream.java | 31 +- .../commons/io/output/WriterOutputStream.java | 55 ++- .../apache/commons/io/output/XmlStreamWriter.java | 29 +- .../commons/io/serialization/ClassNameMatcher.java | 4 +- .../io/serialization/FullClassNameMatcher.java | 8 +- .../io/serialization/RegexpClassNameMatcher.java | 10 +- .../serialization/ValidatingObjectInputStream.java | 74 +-- .../io/serialization/WildcardClassNameMatcher.java | 10 +- .../apache/commons/io/serialization/package.html | 48 +- src/site/resources/profile.clirr | 0 src/site/resources/profile.cobertura | 0 src/site/site.xml | 7 +- src/site/xdoc/description.xml | 20 +- src/site/xdoc/download_io.xml | 60 ++- src/site/xdoc/index.xml | 35 +- src/site/xdoc/issue-tracking.xml | 30 +- src/site/xdoc/upgradeto2_3.xml | 122 ++--- src/site/xdoc/upgradeto2_5.xml | 108 +++- src/site/xdoc/upgradeto2_6.xml | 156 ++++++ .../apache/commons/io/ByteOrderMarkTestCase.java | 13 +- ...putStreamTest.java => ByteOrderParserTest.java} | 41 +- .../org/apache/commons/io/CharsetsTestCase.java | 174 ++++--- .../java/org/apache/commons/io/CopyUtilsTest.java | 15 +- .../java/org/apache/commons/io/DemuxTestCase.java | 16 +- .../apache/commons/io/DirectoryWalkerTestCase.java | 20 +- .../commons/io/DirectoryWalkerTestCaseJava4.java | 64 +-- .../org/apache/commons/io/EndianUtilsTest.java | 8 +- .../org/apache/commons/io/FileCleanerTestCase.java | 6 +- .../commons/io/FileCleaningTrackerTestCase.java | 75 +-- .../commons/io/FileDeleteStrategyTestCase.java | 53 +- .../apache/commons/io/FileSystemUtilsTestCase.java | 48 +- .../io/FileUtilsCleanDirectoryTestCase.java | 43 +- .../commons/io/FileUtilsCleanSymlinksTestCase.java | 32 +- .../io/FileUtilsDirectoryContainsTestCase.java | 47 +- .../commons/io/FileUtilsFileNewerTestCase.java | 69 ++- .../commons/io/FileUtilsListFilesTestCase.java | 44 +- .../org/apache/commons/io/FileUtilsTestCase.java | 375 +++++++------- .../commons/io/FileUtilsWaitForTestCase.java | 13 +- .../apache/commons/io/FilenameUtilsTestCase.java | 147 +++--- .../commons/io/FilenameUtilsWildcardTestCase.java | 10 +- .../java/org/apache/commons/io/HexDumpTest.java | 14 +- .../java/org/apache/commons/io/IOCaseTestCase.java | 16 +- .../commons/io/IOExceptionWithCauseTestCase.java | 10 +- .../org/apache/commons/io/IOUtilsCopyTestCase.java | 24 +- .../org/apache/commons/io/IOUtilsTestCase.java | 542 +++++++++++++------- .../apache/commons/io/IOUtilsWriteTestCase.java | 21 +- .../org/apache/commons/io/Java7SupportTest.java | 57 --- .../apache/commons/io/LineIteratorTestCase.java | 35 +- .../org/apache/commons/io/SelectorAdapter.java | 1 - .../apache/commons/io/TaggedIOExceptionTest.java | 9 +- .../apache/commons/io/ThreadMonitorTestCase.java | 10 +- .../io/comparator/ComparatorAbstractTestCase.java | 45 +- .../io/comparator/CompositeFileComparatorTest.java | 54 +- .../io/comparator/DefaultFileComparatorTest.java | 8 +- .../io/comparator/DirectoryFileComparatorTest.java | 9 +- .../io/comparator/ExtensionFileComparatorTest.java | 10 +- .../comparator/LastModifiedFileComparatorTest.java | 38 +- .../io/comparator/NameFileComparatorTest.java | 10 +- .../io/comparator/PathFileComparatorTest.java | 10 +- .../io/comparator/SizeFileComparatorTest.java | 44 +- .../io/filefilter/AndFileFilterTestCase.java | 34 +- .../ConditionalFileFilterAbstractTestCase.java | 14 +- .../commons/io/filefilter/FileFilterTestCase.java | 264 ++++------ .../filefilter/IOFileFilterAbstractTestCase.java | 6 +- .../io/filefilter/OrFileFilterTestCase.java | 34 +- .../io/filefilter/RegexFileFilterTestCase.java | 25 +- .../commons/io/input/AutoCloseInputStreamTest.java | 14 +- .../commons/io/input/BOMInputStreamTest.java | 54 +- .../commons/io/input/BoundedInputStreamTest.java | 11 +- .../apache/commons/io/input/BoundedReaderTest.java | 43 +- .../commons/io/input/BrokenInputStreamTest.java | 12 +- .../io/input/CharSequenceInputStreamTest.java | 67 +-- .../commons/io/input/CharSequenceReaderTest.java | 7 +- .../io/input/ClassLoaderObjectInputStreamTest.java | 45 +- .../io/input/CloseShieldInputStreamTest.java | 12 +- .../commons/io/input/ClosedInputStreamTest.java | 8 +- .../commons/io/input/CountingInputStreamTest.java | 11 +- .../io/input/InfiniteCircularInputStreamTest.java | 61 +++ .../MessageDigestCalculatingInputStreamTest.java | 50 ++ .../commons/io/input/NullInputStreamTest.java | 11 +- .../apache/commons/io/input/NullReaderTest.java | 11 +- .../io/input/ObservableInputStreamTest.java | 135 +++++ .../apache/commons/io/input/ProxyReaderTest.java | 32 +- .../commons/io/input/ReaderInputStreamTest.java | 5 +- .../ReversedLinesFileReaderTestParamBlockSize.java | 4 +- .../ReversedLinesFileReaderTestParamFile.java | 2 +- .../io/input/SwappedDataInputStreamTest.java | 17 +- .../commons/io/input/TaggedInputStreamTest.java | 74 ++- .../org/apache/commons/io/input/TailerTest.java | 147 +++--- .../commons/io/input/TeeInputStreamTest.java | 9 +- .../io/input/UnixLineEndingInputStreamTest.java | 14 +- .../io/input/WindowsLineEndingInputStreamTest.java | 14 +- .../commons/io/input/XmlStreamReaderTest.java | 8 +- .../io/input/compatibility/XmlStreamReader.java | 11 +- .../compatibility/XmlStreamReaderException.java | 1 - .../XmlStreamReaderUtilitiesCompatibilityTest.java | 6 +- .../io/monitor/AbstractMonitorTestCase.java | 44 +- .../commons/io/monitor/CollectionFileListener.java | 32 +- .../io/monitor/FileAlterationMonitorTestCase.java | 144 +++--- .../io/monitor/FileAlterationObserverTestCase.java | 546 ++++++++++----------- .../io/output/AppendableOutputStreamTest.java | 7 +- .../commons/io/output/BrokenOutputStreamTest.java | 12 +- .../io/output/ByteArrayOutputStreamTestCase.java | 22 +- .../commons/io/output/ChunkedOutputStreamTest.java | 12 +- .../commons/io/output/ChunkedWriterTest.java | 12 +- .../io/output/CloseShieldOutputStreamTest.java | 14 +- .../commons/io/output/ClosedOutputStreamTest.java | 31 +- .../io/output/CountingOutputStreamTest.java | 12 +- .../io/output/DeferredFileOutputStreamTest.java | 56 ++- .../io/output/FileWriterWithEncodingTest.java | 55 +-- .../commons/io/output/LockableFileWriterTest.java | 105 ++-- .../commons/io/output/NullOutputStreamTest.java | 13 +- .../apache/commons/io/output/NullWriterTest.java | 9 +- .../commons/io/output/ProxyOutputStreamTest.java | 10 +- .../apache/commons/io/output/ProxyWriterTest.java | 152 ++---- .../commons/io/output/StringBuilderWriterTest.java | 13 +- .../commons/io/output/TaggedOutputStreamTest.java | 18 +- .../commons/io/output/TeeOutputStreamTest.java | 12 +- .../io/output/ThresholdingOutputStreamTest.java | 5 +- .../commons/io/output/WriterOutputStreamTest.java | 10 +- .../commons/io/output/XmlStreamWriterTest.java | 8 +- .../commons/io/serialization/ClosingBase.java | 12 +- .../io/serialization/MockSerializedClass.java | 8 +- .../io/serialization/MoreComplexObject.java | 6 +- .../io/serialization/MoreComplexObjectTest.java | 21 +- .../serialization/RegexpClassNameMatcherTest.java | 8 +- .../ValidatingObjectInputStreamTest.java | 19 +- .../WildcardClassNameMatcherTest.java | 6 +- .../commons/io/testtools/FileBasedTestCase.java | 38 -- .../org/apache/commons/io/testtools/TestUtils.java | 69 ++- .../io/testtools/YellOnCloseInputStream.java | 8 +- .../testtools/YellOnFlushAndCloseOutputStream.java | 8 +- src/test/resources/test-file-simple-utf8.bin | 1 + 252 files changed, 5207 insertions(+), 4649 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-io.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits