Merge branch 'IO-553'
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/5f880799 Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/5f880799 Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/5f880799 Branch: refs/heads/release Commit: 5f88079956ba7fc4551a5fc51dc28d82e33dc65f Parents: 39bfb46 9543f75 Author: Benedikt Ritter <brit...@apache.org> Authored: Sat Oct 14 13:58:29 2017 +0200 Committer: Benedikt Ritter <brit...@apache.org> Committed: Sat Oct 14 13:58:29 2017 +0200 ---------------------------------------------------------------------- src/changes/changes.xml | 3 +++ src/main/java/org/apache/commons/io/input/BOMInputStream.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-io/blob/5f880799/src/changes/changes.xml ---------------------------------------------------------------------- diff --cc src/changes/changes.xml index bfc9c25,2e69545..1628982 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@@ -47,12 -47,9 +47,15 @@@ The <action> type attribute can be add, <body> <!-- The release date is the date RC is cut --> <release version="2.6" date="2017-MM-DD" description="New features and bug fixes."> + <action issue="IO-553" dev="britter" type="update" due-to="Michael Ernst"> + Make code style of hasBOM() consistent with getBOMCharsetName() + </action> + <action issue="IO-546" dev="pschumacher" type="fix" due-to="Tomas Celaya"> + ClosedOutputStream#flush should throw + </action> + <action issue="IO-551" dev="britter" type="add"> + Add Automatic-Module-Name MANIFEST entry for Java 9 compatibility + </action> <action issue="IO-550" dev="kinow" type="fix" due-to="Jimi Adrian"> Documentation issue, fix 404 Javadoc issues in the description page </action> http://git-wip-us.apache.org/repos/asf/commons-io/blob/5f880799/src/main/java/org/apache/commons/io/input/BOMInputStream.java ----------------------------------------------------------------------
