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:43:59 UTC
[commons-io] branch release updated (9c2a9c1 -> 01f92b1)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch release
in repository https://gitbox.apache.org/repos/asf/commons-io.git.
from 9c2a9c1 Eliminate the downloading progress messages
add ddc2b95 Placeholder for the next release.
add 6a70c4b Placeholder for the next release.
add 78e0a0f Add download page to release notes.
add cd154e9 Fix URLs.
add 0dc3422 Test major Java versions with GitHub actions as documented on https://github.com/actions/setup-java
add 401d173 [IO-669] Fix code smells; fix typos (#115)
add cd77872 [IO-669] Fix code smells; fix typos #115.
add 7ad1704 Add caching for required charsets (#120)
add bcc9f75 Better name to reflect that we are populating the map based on the JRE's StandardCharsets.
add 08a3196 Add caching for required charsets #120.
add e589115 Simplify lambads.
add 1d59399 Remove trailing whitespace.
add e9d29f6 Make some simplifications (#121)
add 1cf3695 [IO-673] Make some simplifications #121.
add 7371285 Fix method names in test.
add 97ae01c Add org.apache.commons.io.input.CircularInputStream.
add 0de91c0 Tweak org.apache.commons.io.input.CircularInputStream.
add 7cf9c0a Next release will be 2.8.
add cddd233 Replace FindBugs with SpotBugs.
add 6eb2689 Replace FindBugs with SpotBugs.
add 19319ea Fix SpotBugs issues in org.apache.commons.io.FileUtils.
add 52f3de5 Behavior seems to have changed from 2.6, use FileVisitOption.FOLLOW_LINKS to remedy.
add 9522c63 @since.
add a834a6e Document API additions.
add bf50f92 Format.
add 1edbed6 Document API additions.
add 50769d2 Sort additions first.
add 821ab5f More sensible build requests.
add 45b08f4 CharSequenceReader.skip should return 0 instead of EOF on stream end #123.
add 807e61e CharSequenceReader.skip should return 0 instead of EOF on stream end (#123)
add 2fd3455 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-io.git
add 6c06f5b Implemented CharSequenceReader.ready (#122)
add a2c7165 Implement CharSequenceReader.ready #122.
add c60a04a Simpler lambdas.
add 1e3642f Minor formatting.
add bf3108c Update tests from org.apache.commons:commons-lang3 3.10 to 3.11.
add 7ef6a88 Javadoc.
add 28a1de4 Add NullAppendable.
add ace6f78 Enable GitHub Dependabot.
add b305131 Add missing header.
add 34686ed Remove unused exceptions. Use try-with-resoruces. Clean ups. Formatting.
add 7f991c6 GitHub builds on Java 8, 11, and 14 (current), allow fails on 15-ea.
add 157935a Fix GitHub action for Java 15-ea.
add a6ab109 GitHub actions/setup-java@v1 -> actions/setup-java@v1.4.0.
add 8ed8dc2 [IO-677] FileSystem.getCurrent() does not return the correct enum.
add 8a8ede6 Bump spotbugs-maven-plugin from 4.0.0 to 4.0.4 (#130)
add e05ec2d Bump commons-parent from 50 to 51 (#129)
add aa9d217 Document recent changes.
add fa425cd Document recent changes.
add 1333707 Bump actions/checkout from v1 to v2.3.1 (#126)
add c9c5021 Bump junit-pioneer from 0.6.0 to 0.7.0 (#127)
add 76573da Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-io.git
add d4847d7 Bump mockito-core from 3.3.3 to 3.4.4 (#128)
add 0dbe957 Document recent changes.
add cce505d [IO-679] input.AbstractCharacterFilterReader passes count of chars read (#132)
add b7d0722 Document recent changes.
add e6a96aa Refactor FileUtils to create new APIs surfacing CopyOption.
add d4e09c7 Label the next version 2.8.0.
add e85750d Tidy test warnings
add 6eb289a NPE-proof a test that provides AclFileAttributeView on Windows but a null on Linux.
add fcccd19 NPE-proof a test that provides AclFileAttributeView on Windows but a null on Linux.
add 273406a Javadoc.
add 857f0f3 Sort members.
add aad49eb Move test method as new PathUtils.getAclEntryList(Path).
add df4979d Document recent changes.
add f3bf58c Better method name.
add ae95096 Bump mockito-core from 3.4.4 to 3.4.6 (#133)
add dc1348e Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-io.git
add e821ce0 Document recent changes.
add d7f98e8 Remove extra blank line.
add c77c7e7 Better inline comment.
add 30dfb20 Bump spotbugs from 4.0.6 to 4.1.1 (#134)
add 2bb2ab0 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-io.git
add e8afd47 Rename internal class from ReverseComparator to ReverseFileComparator.
add 8c0a834 Javadoc cleanups.
add 1a5163c Javadoc cleanups.
add 6332875 Javadoc.
add e24da2b Javadoc.
add 345a66e Bump junit-pioneer from 0.7.0 to 0.8.0 (#135)
add 1beb2be Describe recent change.
add 72ac47c Bump commons-parent from 51 to 52
add 3ddc2f9 Merge pull request #136 from apache/dependabot/maven/org.apache.commons-commons-parent-52
add 382e480 Simplify by using assertThrows
add a9f0436 Ignore VSCode files
add 6034619 Quieten Travis builds
add c2e633a Simplify using assertDoesNotThrow
add e55c7f7 Quieten Github builds
add ed91457 Add --V to CI builds.
add e3bee44 Try with resources tidy-up
add 9741fb8 Test cases for close() methods added in 2.7
add 3ac63df Refactor for simpler subclassing.
add e040627 Unused
add aefc8f4 IO-681 IOUtils.close(Closeable) - allow a list
add 291a35e IO-672 - FileCopy sets date to 01 Jan 1970
add 71bfef4 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-io.git
add 4f02c19 Add getters for simpler subclassing.
add f382ada Null-guard IOUtils.close(Closeable, IOConsumer).
add 5cbb4c7 Restore binary compatibility in IOUtils with latest released version 2.7.
add 31fe0bc Rename test package.
add e5021c2 Rename test classes from "Yell" to "Throw" prefix.
add a5b234e Rename test classes from "Yell" to "Throw" prefix.
add 63bccf4 Reveal issues on Windows.
add fe375a8 Trying to get the GH syntax right...
add 54858b5 Refactor error prone magic numbers.
add cc3e5fb Don't use depreacted constants.
add b344731 Better test
add 257d6f4 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-io.git
add e206649 Don't call File.lastModified() directly but go through wrapper method to allow experimenting with Files.getLastModifiedTime().
add 8b7c822 Don't call File.setLastModified() directly but go through wrapper method to allow experimenting with Files.setLastModifiedTime().
add ced0e49 Comment out OS matrix experiment.
add 468820d Trying to get the GH syntax right...
add 5e8d197 Trying to get the GH syntax right...
add e60db79 Trying to get the GH syntax right... again.
add 3d17107 Try to issues on Windows and Java 15-ea.
add 14d9f7b Better test method name.
add bcb8a8c More assertions to validate test set ups.
add 7165578 Simpler way to get the current time.
add c18ca7b Wrong file checked for size.
add 2d3f67c Millis are longs.
add 9407c2a Since the default behavior of file copying of attributes is OS dependent, we give the new target file the current timestamp when preserveFileDate is false.
add ec3b388 Unused
add 24fc69c Expected value should be first parameter
add 09e3812 Unused
add 0b5b8c6 Better test comparison
add 381265c Enable tests previously dependent on sleep
add fc3e627 Try with resources
add 3ea9a2e Try with resources/assert Throws
add 1eeef3a Try with resources
add 38b9a6a closeQuietly is deprecated
add 61031aa Quieten test and check it works
add 4cede9a Try with resources
add 2e2cc74 Ensure closed
add d97c3bd Plug fresource leaks
add ce9deab Fix warnings
add b20e61e Unfortunately close throws
add 6322b13 Fix sonarlint warnings
add 1a01c87 Spotbugs - allows malicious mutation
add c8d04ca Tidy up spotbugs exclude filter
add d002086 Drop basically empty file
add 247896b Ensure file is different backwards
add eedfc2d refine travis-ci scripts(add cache)
add 93eada5 Merge pull request #116 from XenoAmess/patch-1
add 73bd259 assertion may fail
add ea1f2ff Fix up broken test due to data change
add 2d0ffde Another fix needed
add 367be6a Add a basic package description
add f0aafbc Fix old codehaus issue link
add 0aea834 Bump junit-pioneer from 0.8.0 to 0.9.0 (#138)
add 73db978 junit-pioneer from 0.8.0 to 0.9.0 #138.
add e71f7b7 Quieten sonarlint
add 6820ef5 One declaration per line
add d7fa1f6 Address -1 from Sebb by only stamping target file with the source's timestamp if requested and ignoring test assertions on Windows since the JRE Files class copies the last modified time by default for me on Microsoft Windows [Version 10.0.16299.1992] and OpenJDK Runtime Environment (AdoptOpenJDK)(build 1.8.0_265-b01).
add a521b43 IO-683 failure to convert byte to unsigned
add f075813 Ensure Reversed reader has read all the lines
add b99b3f9 Throw an IOException if calling setLastModified() fails.
add b2fd8c7 Javadoc.
add c26318d Clean up.
add c70be98 Bump actions/checkout from v2.3.1 to v2.3.2 (#140)
add c244009 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-io.git
add 5c78506 Update actions/checkout from v2.3.1 to v2.3.2 #140.
add 0d2bd41 Cache ~/.m2 dir for GitHub builds.
add 3839bf6 IO683 - Fix broken test
add 31a349b IO-639 - add some test files in preparation
add acda845 identify class fields
add a6af211 Add ReversedLinesFileReader.readLines(int).
add 8fe59e4 [IO-684] Add force version of PathUtils.delete() APIs and friends.
add 3f7f609 actions/setup-java from v1.4.0 to v1.4.1 #141.
add e4fd45a Bump actions/setup-java from v1.4.0 to v1.4.1 (#141)
add 7adaaca Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-io.git
add 5026e54 Assert that the test set up worked.
add 3aff3e0 Call Maven with trimStackTrace=false.
add 2fdc70b Restore old test.
add 0c0858c Add comment.
add 2c92782 Better test assert message. Javadoc fix. Follow links when disabling readonly flag for a delete path call.
add 69dc2f2 Repairing build on Linux... reverting old behavior.
add 7ec3387 Reuse IOExceptionList and fix checkstyle unused imports.
add 639f71f Remove trailing white spaces. Use final.
add 946a5b7 Reuse IOExceptionList.
add 9a212e8 Sort methods in AB order.
add 059a07c Javadoc nits.
add 2acd50b Add ReversedLinesFileReader.toString(int).
add 117397e Add RandomAccessFileInputStream.
add 6d9edc6 Bump spotbugs from 4.1.1 to 4.1.2 (#144)
add 6a02237 Bump mockito-core from 3.4.6 to 3.5.2 #145.
add cbc6981 Bump mockito-core from 3.4.6 to 3.5.2 (#145)
add d590982 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-io.git
add 112de65 Keep updates together.
add e1378dc Sort methods in AB order.
add 4f47132 Sort methods in AB order.
add c1692f4 Add IOUtils.consume(InputStream).
add 418bd2b Allow null input IOUtils.copyLarge(InputStream, OutputStream, byte[]) to act as a noop and return 0 bytes copied count.
add 6d070b5 Reuse skip buffer instead of allocating a new one on each call. Make the skip buffer size the same as DEFAULT_BUFFER_SIZE.
add 870b9e2 Deprecate IOUtils.LINE_SEPARATOR in favor of Java 7's System.lineSeparator().
add 7ecad91 Add @SuppressWarnings("resource") with a comment.
add 3c03101 Abbreviate and only call readLine() once in the loop.
add 40256d9 Abbreviate and only call readLine() once in the loop.
add 303f0ca First cut at a security page for GitHub like https://commons.apache.org/security.html
add 2930012 Add license header. Can't find a good way to do comments in Markdown.
add b7b804c Remove list of links.
add d9124f6 Bump mockito-core from 3.5.2 to 3.5.7 (#149)
add b0200d8 mockito-core from 3.5.2 to 3.5.7 #149.
add c6967e7 Bump actions/setup-java from v1.4.1 to v1.4.2 (#148)
add 7f68e6c actions/setup-java from v1.4.1 to v1.4.2 #148.
add c1fb4ae [IO-676] Add isFileNewer() and isFileOlder() methods that support the Java 8 Date/Time API. (#124)
add 891a55d [IO-676] Add isFileNewer() and isFileOlder() methods that support the Java 8 Date/Time API. #124.
add bef89cf Use @since 2.8.0.
add 07abbbb Sort methods in AB order.
add 688cd98 Use final.
add fab7598 Remove //-- spacers.
add 4bb9dea Better local var names.
add 70518f9 Format tweak.
add 567ef26 Move test fixtures to package specific location.
add e26387a Prevent NullPointerException in ReversedLinesFileReader constructors #117.
add 35453bd Use US English spelling.
add 37522ff Use US English spelling.
add 5cf9120 Trigger a GitHub build on pull requests.
add e3b284c Bump mockito-core from 3.5.7 to 3.5.9 (#151)
add 5d20f09 mockito-core from 3.5.7 to 3.5.9 #151.
add 269edfd Javadoc: Close paragraph tags.
add e8f4209 Add a MarkShieldInputStream (#119)
add 80c7912 Add a MarkShieldInputStream #119.
add 2e51ec0 In-line local var. Javadoc: Close paragraph tags. Format nits.
add a65adce Javadoc.
add ec961e5 Javadoc.
add d0e8c21 - Javadoc. - Add @SuppressWarnings("resource") for parameter null checks. - Better private method name. - Format nits.
add 35f71a7 Fix compiler warnings, use try-with-resources.
add 7119cc7 Fix compiler warnings, remove exceptions not thrown from method signatures.
add d531c3b Remove dead comments.
add e65b52b Use try-with-resources. Fix some formatting.
add c0f4623 Fix SpotBugs issues.
add 022246b Prepare for release.
add dcdd277 Prepare for release.
new 01f92b1 Merge from master and resolve conflicts.
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:
.gitattributes => .github/dependabot.yml | 22 +-
.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 +-
...InputStream.java => MarkShieldInputStream.java} | 41 +-
.../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/{output => input/buffer}/package.html | 4 +-
.../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 +-
...{CloseShieldWriter.java => NullAppendable.java} | 41 +-
.../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 +-
.../NullAppendableTest.java} | 19 +-
.../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, 4554 insertions(+), 2428 deletions(-)
copy .gitattributes => .github/dependabot.yml (75%)
create mode 100644 SECURITY.md
delete mode 100644 findbugs-exclude-filter.xml
create mode 100644 spotbugs-exclude-filter.xml
rename src/main/java/org/apache/commons/io/comparator/{ReverseComparator.java => ReverseFileComparator.java} (70%)
rename src/main/java/org/apache/commons/io/{input/buffer/package-info.java => file/DeleteOption.java} (73%)
create mode 100644 src/main/java/org/apache/commons/io/file/StandardDeleteOption.java
create mode 100644 src/main/java/org/apache/commons/io/input/CircularInputStream.java
copy src/main/java/org/apache/commons/io/input/{CloseShieldInputStream.java => MarkShieldInputStream.java} (54%)
create mode 100644 src/main/java/org/apache/commons/io/input/RandomAccessFileInputStream.java
copy src/main/java/org/apache/commons/io/{output => input/buffer}/package.html (85%)
copy src/main/java/org/apache/commons/io/output/{CloseShieldWriter.java => NullAppendable.java} (53%)
create mode 100644 src/test/java/org/apache/commons/io/TestResources.java
copy src/test/java/org/apache/commons/io/input/{InfiniteCircularInputStreamTest.java => CircularInputStreamTest.java} (53%)
create mode 100644 src/test/java/org/apache/commons/io/input/MarkShieldInputStreamTest.java
create mode 100644 src/test/java/org/apache/commons/io/input/RandomAccessFileInputStreamTest.java
copy src/test/java/org/apache/commons/io/{input/ClosedReaderTest.java => output/NullAppendableTest.java} (67%)
rename src/test/java/org/apache/commons/io/{testtools => test}/TestUtils.java (94%)
rename src/test/java/org/apache/commons/io/{testtools/YellOnCloseInputStream.java => test/ThrowOnCloseInputStream.java} (87%)
rename src/test/java/org/apache/commons/io/{testtools/YellOnCloseOutputStream.java => test/ThrowOnCloseOutputStream.java} (87%)
rename src/test/java/org/apache/commons/io/{testtools/YellOnCloseReader.java => test/ThrowOnCloseReader.java} (88%)
rename src/test/java/org/apache/commons/io/{testtools/YellOnCloseWriter.java => test/ThrowOnCloseWriter.java} (88%)
rename src/test/java/org/apache/commons/io/{testtools/YellOnFlushAndCloseOutputStream.java => test/ThrowOnFlushAndCloseOutputStream.java} (71%)
rename src/test/resources/org/apache/commons/io/{input => }/CharSequenceReader.bin (100%)
create mode 100644 src/test/resources/org/apache/commons/io/io639-1.bin
create mode 100644 src/test/resources/org/apache/commons/io/io639-2.bin
create mode 100644 src/test/resources/org/apache/commons/io/io639-3.bin
create mode 100644 src/test/resources/org/apache/commons/io/io639-4.bin
create mode 100644 src/test/resources/org/apache/commons/io/io639-5.bin
rename src/test/resources/{ => org/apache/commons/io}/test-file-20byteslength.bin (50%)
rename src/test/resources/{ => org/apache/commons/io}/test-file-empty.bin (100%)
rename src/test/resources/{ => org/apache/commons/io}/test-file-gbk.bin (100%)
rename src/test/resources/{ => org/apache/commons/io}/test-file-iso8859-1-shortlines-win-linebr.bin (100%)
rename src/test/resources/{ => org/apache/commons/io}/test-file-iso8859-1.bin (100%)
rename src/test/resources/{ => org/apache/commons/io}/test-file-shiftjis.bin (100%)
rename src/test/resources/{ => org/apache/commons/io}/test-file-simple-utf8.bin (100%)
rename src/test/resources/{ => org/apache/commons/io}/test-file-utf16be.bin (100%)
rename src/test/resources/{ => org/apache/commons/io}/test-file-utf16le.bin (100%)
rename src/test/resources/{ => org/apache/commons/io}/test-file-utf8-cr-only.bin (100%)
rename src/test/resources/{ => org/apache/commons/io}/test-file-utf8-win-linebr.bin (100%)
rename src/test/resources/{ => org/apache/commons/io}/test-file-utf8.bin (100%)
rename src/test/resources/{ => org/apache/commons/io}/test-file-windows-31j.bin (100%)
rename src/test/resources/{ => org/apache/commons/io}/test-file-x-windows-949.bin (100%)
rename src/test/resources/{ => org/apache/commons/io}/test-file-x-windows-950.bin (100%)
[commons-io] 01/01: Merge from master and resolve conflicts.
Posted by gg...@apache.org.
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(-)