You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2017/10/14 12:14:35 UTC
[01/19] commons-io git commit: Make code style of hasBOM() consistent
with getBOMCharsetName() [Forced Update!]
Repository: commons-io
Updated Branches:
refs/heads/release 79e236e05 -> a21908178 (forced update)
Make code style of hasBOM() consistent with getBOMCharsetName()
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/46a2c6be
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/46a2c6be
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/46a2c6be
Branch: refs/heads/release
Commit: 46a2c6bebe30989d51d59e14def38a82e8edfd78
Parents: 733dc26
Author: Michael Ernst <me...@cs.washington.edu>
Authored: Fri Sep 15 11:19:18 2017 -0700
Committer: Michael Ernst <me...@cs.washington.edu>
Committed: Fri Sep 15 11:19:18 2017 -0700
----------------------------------------------------------------------
src/main/java/org/apache/commons/io/input/BOMInputStream.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/46a2c6be/src/main/java/org/apache/commons/io/input/BOMInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/io/input/BOMInputStream.java b/src/main/java/org/apache/commons/io/input/BOMInputStream.java
index 02b4f2f..d01ba9c 100644
--- a/src/main/java/org/apache/commons/io/input/BOMInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/BOMInputStream.java
@@ -202,7 +202,8 @@ public class BOMInputStream extends ProxyInputStream {
if (!boms.contains(bom)) {
throw new IllegalArgumentException("Stream not configure to detect " + bom);
}
- return byteOrderMark != null && getBOM().equals(bom);
+ getBOM();
+ return byteOrderMark != null && byteOrderMark.equals(bom);
}
/**
[12/19] commons-io git commit: Fix documentation - ByteOrderParser is
case sensitive
Posted by br...@apache.org.
Fix documentation - ByteOrderParser is case sensitive
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/39bfb464
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/39bfb464
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/39bfb464
Branch: refs/heads/release
Commit: 39bfb4645c23a673684dc5d62278cd83937a38c8
Parents: 0856ec5
Author: Benedikt Ritter <br...@apache.org>
Authored: Sat Oct 14 13:49:28 2017 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sat Oct 14 13:49:28 2017 +0200
----------------------------------------------------------------------
src/main/java/org/apache/commons/io/ByteOrderParser.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/39bfb464/src/main/java/org/apache/commons/io/ByteOrderParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/io/ByteOrderParser.java b/src/main/java/org/apache/commons/io/ByteOrderParser.java
index 8702665..ee47469 100644
--- a/src/main/java/org/apache/commons/io/ByteOrderParser.java
+++ b/src/main/java/org/apache/commons/io/ByteOrderParser.java
@@ -33,7 +33,7 @@ public final class ByteOrderParser {
}
/**
- * Parses the String argument as a {@link ByteOrder}, ignoring case.
+ * Parses the String argument as a {@link ByteOrder}.
* <p>
* Returns {@code ByteOrder.LITTLE_ENDIAN} if the given value is {@code "LITTLE_ENDIAN"}.
* </p>
[18/19] commons-io git commit: Update site for Release 2.6
Posted by br...@apache.org.
Update site for Release 2.6
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/27846330
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/27846330
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/27846330
Branch: refs/heads/release
Commit: 27846330dfb7dcc1b2ce64f04666bc35aff6724d
Parents: 78fc6c7
Author: Benedikt Ritter <br...@apache.org>
Authored: Sat Sep 30 16:31:30 2017 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sat Oct 14 14:04:02 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 2 +-
src/site/site.xml | 3 +
src/site/xdoc/index.xml | 35 ++++++--
src/site/xdoc/upgradeto2_6.xml | 156 ++++++++++++++++++++++++++++++++++++
4 files changed, 189 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/27846330/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 1628982..cdba10f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -46,7 +46,7 @@ The <action> type attribute can be add,update,fix,remove.
<body>
<!-- The release date is the date RC is cut -->
- <release version="2.6" date="2017-MM-DD" description="New features and bug fixes.">
+ <release version="2.6" date="2017-09-30" description="Java 7 required, Java 9 supported.">
<action issue="IO-553" dev="britter" type="update" due-to="Michael Ernst">
Make code style of hasBOM() consistent with getBOMCharsetName()
</action>
http://git-wip-us.apache.org/repos/asf/commons-io/blob/27846330/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 8ac3aee..3c92886 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -28,7 +28,10 @@
<item name="Download" href="http://commons.apache.org/io/download_io.cgi"/>
<item name="User guide" href="/description.html"/>
<item name="Best practices" href="/bestpractices.html"/>
+ <item name="Javadoc 2.6" href="/javadocs/api-release/index.html"/>
+ <item name="Javadoc 2.5" href="/javadocs/api-2.5/index.html"/>
<item name="Javadoc 2.4" href="/javadocs/api-2.4/index.html"/>
+ <item name="Javadoc 2.3" href="/javadocs/api-2.3/index.html"/>
<item name="Javadoc 2.2" href="/javadocs/api-2.2/index.html"/>
<item name="Javadoc 1.4" href="/javadocs/api-1.4/index.html"/>
</menu>
http://git-wip-us.apache.org/repos/asf/commons-io/blob/27846330/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 7a1f160..e4dfc1a 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -47,29 +47,52 @@ There are six main areas included:
<!-- ================================================== -->
<section name="Releases">
- <subsection name="Commons IO 2.5 (requires JDK 1.6+)">
+ <subsection name="Commons IO 2.6 (requires JDK 1.7+)">
<p>
- Commons IO 2.5 is the latest version and requires a minimum of JDK 1.6 -
+ Commons IO 2.6 is the latest version and requires a minimum of JDK 1.7 -
<a href="http://commons.apache.org/io/download_io.cgi">Download now!</a>
</p>
<p>
View the
- <a href="upgradeto2_5.html">Release Notes</a>
+ <a href="upgradeto2_6.html">Release Notes</a>
and
<a href="javadocs/api-release/index.html">JavaDoc API documents</a>
</p>
</subsection>
+ <subsection name="Commons IO 2.5 (requires JDK 1.6+)">
+ <p>
+ Commons IO 2.5 requires a minimum of JDK 1.6 -
+ <a href="http://commons.apache.org/io/download_io.cgi">Download now!</a>
+ </p>
+ <p>
+ View the
+ <a href="upgradeto2_5.html">Release Notes</a>
+ and
+ <a href="javadocs/api-2.5/index.html">JavaDoc API documents</a>
+ </p>
+ </subsection>
<subsection name="Commons IO 2.4 (requires JDK 1.6+)">
<p>
Commons IO 2.4 requires a minimum of JDK 1.6 -
<a href="http://commons.apache.org/io/download_io.cgi">Download now!</a>
-</p>
+</p>
<p>
View the <a href="upgradeto2_4.html">Release Notes</a> and
-<a href="javadocs/api-release/index.html">JavaDoc API documents</a>
-</p>
+<a href="javadocs/api-2.4/index.html">JavaDoc API documents</a>
+</p>
+</subsection>
+
+ <subsection name="Commons IO 2.3 (requires JDK 1.6+)">
+<p>
+ Commons IO 2.3 requires a minimum of JDK 1.6 -
+<a href="http://commons.apache.org/io/download_io.cgi">Download now!</a>
+</p>
+<p>
+View the <a href="upgradeto2_3.html">Release Notes</a> and
+<a href="javadocs/api-2.3/index.html">JavaDoc API documents</a>
+</p>
</subsection>
<subsection name="Commons IO 2.2 (requires JDK 1.5+)">
http://git-wip-us.apache.org/repos/asf/commons-io/blob/27846330/src/site/xdoc/upgradeto2_6.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/upgradeto2_6.xml b/src/site/xdoc/upgradeto2_6.xml
new file mode 100644
index 0000000..d2ef300
--- /dev/null
+++ b/src/site/xdoc/upgradeto2_6.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<document>
+ <properties>
+ <title>Upgrade from 2.5 to 2.6</title>
+ <author email="dev@commons.apache.org">Commons Documentation Team</author>
+ </properties>
+ <body>
+
+ <section name="Upgrade">
+ <p>
+ These are the release notes and advice for upgrading Apache Commons IO from
+ version 2.5 to version 2.6
+ <source>
+ Apache Commons IO is a package of Java utility classes like java.io.
+ Classes in this package are considered to be so standard and of such high
+ reuse as to justify existence in java.io.
+
+ The Apache Commons IO library contains utility classes, stream implementations,
+ file filters, file comparators, endian transformation classes, and much more.
+
+ Apache Commons IO 2.6 requires at least Java 7 to build and run.
+
+
+ DEPRECATIONS
+ ============
+
+ All closeQuietly overloads in org.apache.commons.io.IOUtils have been
+ deprecated. Use the try-with-resources statement or handle suppressed
+ exceptions manually.
+
+ The class org.apache.commons.io.FileSystemUtils has been deprecated.
+ Use equivalent methods in java.nio.file.FileStore instead, e.g.
+ Files.getFileStore(Paths.get("/home")).getUsableSpace() or iterate over
+ FileSystems.getDefault().getFileStores().
+
+
+ COMPATIBILITY WITH JAVA 9
+ ==================
+
+ The MANIFEST.MF now contains an additional entry:
+
+ Automatic-Module-Name: org.apache.commons.io
+
+ This should make it possible to use Commons IO 2.6 as a module in the Java 9
+ module system. For more information see the corresponding issue:
+
+ https://issues.apache.org/jira/browse/IO-551
+
+ Building Commons IO 2.6 should work out of the box with the latest Java 9
+ release. Please report any Java 9 related issues at:
+
+ https://issues.apache.org/jira/browse/IO
+
+
+ NEW FEATURES
+ ============
+
+ o IO-551: Add Automatic-Module-Name MANIFEST entry for Java 9 compatibility.
+ o IO-367: Add convenience methods for copyToDirectory. Thanks to James Sawle.
+ o IO-493: Add infinite circular input stream. Thanks to Piotr Turski.
+ o IO-507: Add a ByteOrderUtils class.
+ o IO-518: Add ObservableInputStream.
+ o IO-519: Add MessageDigestCalculatingInputStream.
+ o IO-513: Add convenience methods for reading class path resources.
+ Thanks to Behrang Saeedzadeh.
+
+ FIXED BUGS
+ ==========
+
+ o IO-550: Documentation issue, fix 404 Javadoc issues in the description page.
+ Thanks to Jimi Adrian.
+ o IO-442: Javadoc contradictory for FileFilterUtils.ageFileFilter(cutoff) and
+ the filter it constructs: AgeFileFilter(cutoff).
+ Thanks to Simon Robinson.
+ o IO-534: FileUtilTestCase.testForceDeleteDir() should not delete testDirectory
+ parent.
+ o IO-528: Fix Tailer.run race condition runaway logging. Thanks to Dave Moten.
+ o IO-483: getPrefixLength return -1 if unix file contains colon.
+ Thanks to Marko Vasic.
+ o IO-520: FileUtilsTestCase#testContentEqualsIgnoreEOL fails on Windows.
+ o IO-516: .gitattributes not correctly applied. Thanks to Jason Pyeron.
+ o IO-515: Allow Specifying Initial Buffer Size of DeferredFileOutputStream.
+ Thanks to Brett Lounsbury, Gary Gregory.
+ o IO-512: ThresholdingOutputStream.thresholdReached() results in
+ FileNotFoundException. Thanks to Ralf Hauser.
+ o IO-511: After a few unit tests, a few newly created directories not cleaned
+ completely. Thanks to Ahmet Celik.
+ o IO-502: Exceptions are suppressed incorrectly when copying files.
+ Thanks to Christian Schulte.
+ o IO-503: Update platform requirement to Java 7.
+ o IO-537: BOMInputStream shouldn't sort array of BOMs in-place.
+ Thanks to Borys Zibrov.
+
+ CHANGES
+ =======
+
+ o IO-542: FileUtils#readFileToByteArray: optimize reading of files with known
+ size. Thanks to Ilmars Poikans.
+ o IO-547: Throw a IllegalArgumentException instead of NullPointerException in
+ FileSystemUtils.freeSpaceWindows(). Thanks to Nikhil Shinde,
+ Michael Ernst, Gary Greory.
+ o IO-506: Deprecate methods FileSystemUtils.freeSpaceKb().
+ Thanks to Christian Schulte.
+ o IO-505: Make LineIterator implement Closeable to support try-with-resources
+ statements. Thanks to Christian Schulte.
+ o IO-504: Deprecated of all IOUtils.closeQuietly() methods and use
+ try-with-resources internally. Thanks to Christian Schulte.
+
+ REMOVED
+ =======
+
+ o IO-514: Remove org.apache.commons.io.Java7Support.
+
+ COMPATIBILITY WITH OLDER VERSIONS
+ =================================
+
+ Compatibility with 2.5:
+ Binary compatible: Yes.
+ Source compatible: Yes.
+ Semantic compatible: Yes.
+
+ Compatibility with 2.6 and 1.4:
+ Binary compatible: Yes.
+ Source compatible: No, see the rare case in
+ https://issues.apache.org/jira/browse/IO-318.
+ Semantic compatible: No, see the rare case in
+ https://issues.apache.org/jira/browse/IO-318.
+
+ Commons IO 2.6 requires JDK 1.7 or later.
+ Commons IO 2.5 requires JDK 1.6 or later.
+ Commons IO 2.4 requires JDK 1.6 or later.
+ Commons IO 2.3 requires JDK 1.6 or later.
+ Commons IO 2.2 requires JDK 1.5 or later.
+ Commons IO 1.4 requires JDK 1.3 or later.
+ </source>
+ </p>
+ </section>
+
+ </body>
+</document>
[10/19] commons-io git commit: [IO-507] Add a ByteOrderParser class.
Posted by br...@apache.org.
[IO-507] Add a ByteOrderParser class.
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/7379cbb2
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/7379cbb2
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/7379cbb2
Branch: refs/heads/release
Commit: 7379cbb2fe7b69aa871127e64a51763c445a570e
Parents: fa24ac8
Author: Benedikt Ritter <br...@apache.org>
Authored: Fri Oct 13 18:02:05 2017 -0600
Committer: ggregory <gg...@apache.org>
Committed: Fri Oct 13 18:02:05 2017 -0600
----------------------------------------------------------------------
src/changes/changes.xml | 2 +-
.../org/apache/commons/io/ByteOrderParser.java | 67 ++++++++++++++++
.../org/apache/commons/io/ByteOrderUtils.java | 82 --------------------
.../apache/commons/io/ByteOrderParserTest.java | 44 +++++++++++
.../apache/commons/io/ByteOrderUtilsTest.java | 43 ----------
5 files changed, 112 insertions(+), 126 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/7379cbb2/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 6372483..bfc9c25 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -114,7 +114,7 @@ The <action> type attribute can be add,update,fix,remove.
Add infinite circular input stream
</action>
<action issue="IO-507" dev="ggregory" type="add">
- Add a ByteOrderUtils class.
+ Add a ByteOrderParser class.
</action>
<action issue="IO-518" dev="jochen" type="add">
Add ObservableInputStream
http://git-wip-us.apache.org/repos/asf/commons-io/blob/7379cbb2/src/main/java/org/apache/commons/io/ByteOrderParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/io/ByteOrderParser.java b/src/main/java/org/apache/commons/io/ByteOrderParser.java
new file mode 100644
index 0000000..9e7d298
--- /dev/null
+++ b/src/main/java/org/apache/commons/io/ByteOrderParser.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.io;
+
+import java.nio.ByteOrder;
+import java.util.Locale;
+
+/**
+ * Converts Strings to {@link ByteOrder} instances.
+ *
+ * @since 2.6
+ */
+public final class ByteOrderParser {
+
+ /**
+ * ByteOrderUtils is a static utility class, so prevent construction with a private constructor.
+ */
+ private ByteOrderParser() {
+ }
+
+ /**
+ * Parses the String argument as a {@link ByteOrder}, ignoring case.
+ * <p>
+ * Returns {@code ByteOrder.LITTLE_ENDIAN} if the given value is {@code "LITTLE_ENDIAN"}.
+ * </p>
+ * <p>
+ * Returns {@code ByteOrder.BIG_ENDIAN} if the given value is {@code "BIG_ENDIAN"}.
+ * </p>
+ * Examples:
+ * <ul>
+ * <li>{@code ByteOrderParser.parseByteOrder("LITTLE_ENDIAN")} returns {@code ByteOrder.LITTLE_ENDIAN}</li>
+ * <li>{@code ByteOrderParser.parseByteOrder("BIG_ENDIAN")} returns {@code ByteOrder.BIG_ENDIAN}</li>
+ * </ul>
+ *
+ * @param value
+ * the {@code String} containing the ByteOrder representation to be parsed
+ * @return the ByteOrder represented by the string argument
+ * @throws IllegalArgumentException
+ * if the {@code String} containing the ByteOrder representation to be parsed is unknown.
+ */
+ public static ByteOrder parseByteOrder(final String value) {
+ if (ByteOrder.BIG_ENDIAN.toString().equals(value)) {
+ return ByteOrder.BIG_ENDIAN;
+ }
+ if (ByteOrder.LITTLE_ENDIAN.toString().equals(value)) {
+ return ByteOrder.LITTLE_ENDIAN;
+ }
+ throw new IllegalArgumentException("Unsupported byte order setting: " + value + ", expeced one of " + ByteOrder.LITTLE_ENDIAN +
+ ", " + ByteOrder.BIG_ENDIAN);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/commons-io/blob/7379cbb2/src/main/java/org/apache/commons/io/ByteOrderUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/io/ByteOrderUtils.java b/src/main/java/org/apache/commons/io/ByteOrderUtils.java
deleted file mode 100644
index 96ca446..0000000
--- a/src/main/java/org/apache/commons/io/ByteOrderUtils.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.io;
-
-import java.nio.ByteOrder;
-import java.util.Locale;
-
-/**
- * Converts Strings to {@link ByteOrder} instances.
- *
- * @since 2.6
- */
-public final class ByteOrderUtils {
-
- private static final Locale ComparisonLocale = Locale.ROOT;
-
- /**
- * Big endian.
- */
- public static final String BIG_ENDIAN = "Big";
-
- /**
- * Little endian.
- */
- public static final String LITTLE_ENDIAN = "Little";
-
- /**
- * ByteOrderUtils is a static utility class, so prevent construction with a private constructor.
- */
- private ByteOrderUtils() {
- }
-
- /**
- * Parses the String argument as a {@link ByteOrder}, ignoring case.
- * <p>
- * Returns {@code ByteOrder.LITTLE_ENDIAN} if the given value is {@code "little"} or {@code "LITTLE_ENDIAN"}.
- * </p>
- * <p>
- * Returns {@code ByteOrder.BIG_ENDIAN} if the given value is {@code "big"} or {@code "BIG_ENDIAN"}.
- * </p>
- * Examples:
- * <ul>
- * <li>{@code ByteOrderUtils.parseByteOrder("little")} returns {@code ByteOrder.LITTLE_ENDIAN}</li>
- * <li>{@code ByteOrderUtils.parseByteOrder("big")} returns {@code ByteOrder.BIG_ENDIAN}</li>
- * </ul>
- *
- * @param value
- * the {@code String} containing the ByteOrder representation to be parsed
- * @return the ByteOrder represented by the string argument
- * @throws IllegalArgumentException
- * if the {@code String} containing the ByteOrder representation to be parsed is unknown.
- */
- public static ByteOrder parseByteOrder(final String value) {
- final String valueUp = value.toUpperCase(ComparisonLocale);
- final String bigEndianUp = BIG_ENDIAN.toUpperCase(ComparisonLocale);
- final String littleEndianUp = LITTLE_ENDIAN.toUpperCase(ComparisonLocale);
- if (bigEndianUp.equals(valueUp) || ByteOrder.BIG_ENDIAN.toString().equals(valueUp)) {
- return ByteOrder.BIG_ENDIAN;
- }
- if (littleEndianUp.equals(valueUp) || ByteOrder.LITTLE_ENDIAN.toString().equals(valueUp)) {
- return ByteOrder.LITTLE_ENDIAN;
- }
- throw new IllegalArgumentException("Unsupported byte order setting: " + value + ", expeced one of " + ByteOrder.LITTLE_ENDIAN + ", " +
- LITTLE_ENDIAN + ", " + ByteOrder.BIG_ENDIAN + ", " + bigEndianUp);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/commons-io/blob/7379cbb2/src/test/java/org/apache/commons/io/ByteOrderParserTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/io/ByteOrderParserTest.java b/src/test/java/org/apache/commons/io/ByteOrderParserTest.java
new file mode 100644
index 0000000..a3310d4
--- /dev/null
+++ b/src/test/java/org/apache/commons/io/ByteOrderParserTest.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.io;
+
+import java.nio.ByteOrder;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ByteOrderParserTest {
+
+ private ByteOrder parseByteOrder(final String value) {
+ return ByteOrderParser.parseByteOrder(value);
+ }
+
+ @Test
+ public void testParseBig() {
+ Assert.assertEquals(ByteOrder.BIG_ENDIAN, parseByteOrder("BIG_ENDIAN"));
+ }
+
+ @Test
+ public void testParseLittle() {
+ Assert.assertEquals(ByteOrder.LITTLE_ENDIAN, parseByteOrder("LITTLE_ENDIAN"));
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testThrowsException() throws Exception {
+ parseByteOrder("some value");
+ }
+}
http://git-wip-us.apache.org/repos/asf/commons-io/blob/7379cbb2/src/test/java/org/apache/commons/io/ByteOrderUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/io/ByteOrderUtilsTest.java b/src/test/java/org/apache/commons/io/ByteOrderUtilsTest.java
deleted file mode 100644
index 2affec4..0000000
--- a/src/test/java/org/apache/commons/io/ByteOrderUtilsTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.io;
-
-import java.nio.ByteOrder;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class ByteOrderUtilsTest {
-
- private ByteOrder parseByteOrder(final String value) {
- return ByteOrderUtils.parseByteOrder(value);
- }
-
- @Test
- public void testParseBig() {
- Assert.assertEquals(ByteOrder.BIG_ENDIAN, parseByteOrder("big"));
- Assert.assertEquals(ByteOrder.BIG_ENDIAN, parseByteOrder("Big"));
- Assert.assertEquals(ByteOrder.BIG_ENDIAN, parseByteOrder("BIG"));
- }
-
- @Test
- public void testParseLittle() {
- Assert.assertEquals(ByteOrder.LITTLE_ENDIAN, parseByteOrder("little"));
- Assert.assertEquals(ByteOrder.LITTLE_ENDIAN, parseByteOrder("Little"));
- Assert.assertEquals(ByteOrder.LITTLE_ENDIAN, parseByteOrder("LITTLE"));
- }
-}
[13/19] commons-io git commit: IO-553: Add changes.xml entry
Posted by br...@apache.org.
IO-553: Add changes.xml entry
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/9543f75f
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/9543f75f
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/9543f75f
Branch: refs/heads/release
Commit: 9543f75f4601278abcfd0a16cfea977399b89052
Parents: 46a2c6b
Author: Benedikt Ritter <br...@apache.org>
Authored: Sat Oct 14 13:57:28 2017 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sat Oct 14 13:57:28 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/9543f75f/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 551b27b..2e69545 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -47,6 +47,9 @@ The <action> type attribute can be add,update,fix,remove.
<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-550" dev="kinow" type="fix" due-to="Jimi Adrian">
Documentation issue, fix 404 Javadoc issues in the description page
</action>
[11/19] commons-io git commit: Make checkstyle happy
Posted by br...@apache.org.
Make checkstyle happy
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/0856ec5c
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/0856ec5c
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/0856ec5c
Branch: refs/heads/release
Commit: 0856ec5c0d7a4e1f0af44d2364f6d2310967f9fd
Parents: 7379cbb
Author: Benedikt Ritter <br...@apache.org>
Authored: Sat Oct 14 13:48:31 2017 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sat Oct 14 13:48:31 2017 +0200
----------------------------------------------------------------------
src/main/java/org/apache/commons/io/ByteOrderParser.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/0856ec5c/src/main/java/org/apache/commons/io/ByteOrderParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/io/ByteOrderParser.java b/src/main/java/org/apache/commons/io/ByteOrderParser.java
index 9e7d298..8702665 100644
--- a/src/main/java/org/apache/commons/io/ByteOrderParser.java
+++ b/src/main/java/org/apache/commons/io/ByteOrderParser.java
@@ -18,7 +18,6 @@
package org.apache.commons.io;
import java.nio.ByteOrder;
-import java.util.Locale;
/**
* Converts Strings to {@link ByteOrder} instances.
[07/19] commons-io git commit: travis: remove travis profile from pom
and use travis-cobertura profile commons-parent
Posted by br...@apache.org.
travis: remove travis profile from pom and use travis-cobertura profile commons-parent
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/43720d02
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/43720d02
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/43720d02
Branch: refs/heads/release
Commit: 43720d02405e0b96939b331c1be7812fe5fec877
Parents: 46fa7b5
Author: pascalschumacher <pa...@gmx.net>
Authored: Sun Oct 1 16:06:44 2017 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Sun Oct 1 16:06:44 2017 +0200
----------------------------------------------------------------------
.travis.yml | 2 +-
pom.xml | 28 ----------------------------
2 files changed, 1 insertion(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/43720d02/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 860ae28..4977537 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,4 +25,4 @@ script:
- mvn
after_success:
- - mvn clean cobertura:cobertura coveralls:report
+ - mvn clean cobertura:cobertura coveralls:report -Ptravis-cobertura
http://git-wip-us.apache.org/repos/asf/commons-io/blob/43720d02/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d7354d4..d1dd3e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -428,34 +428,6 @@ file comparators, endian transformation classes, and much more.
</build>
</profile>
<profile>
- <id>travis</id>
- <activation>
- <property>
- <name>env.TRAVIS</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${commons.cobertura.version}</version>
- <configuration>
- <formats>
- <format>xml</format>
- </formats>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eluder.coveralls</groupId>
- <artifactId>coveralls-maven-plugin</artifactId>
- <version>3.1.0</version>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>java9</id>
<activation>
<jdk>9</jdk>
[16/19] commons-io git commit: Prepare release notes for Commons IO
2.6
Posted by br...@apache.org.
Prepare release notes for Commons IO 2.6
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/84a5fcfb
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/84a5fcfb
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/84a5fcfb
Branch: refs/heads/release
Commit: 84a5fcfb48254e1e97a3fc22d30830387476f79c
Parents: a246ac8
Author: Benedikt Ritter <br...@apache.org>
Authored: Sat Sep 30 16:17:35 2017 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sat Oct 14 14:04:01 2017 +0200
----------------------------------------------------------------------
RELEASE-NOTES.txt | 133 ++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 125 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/84a5fcfb/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 5c0b936..db0bffb 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,16 +1,133 @@
-
-Apache Commons IO
-Version 2.5
-Release Notes
+ Apache Commons IO
+ Version 2.6
+ Release Notes
INTRODUCTION:
-Commons IO is a package of Java utility classes like java.io.
-Classes in this package are considered to be so standard and of such high
+Apache Commons IO is a package of Java utility classes like java.io.
+Classes in this package are considered to be so standard and of such high
reuse as to justify existence in java.io.
-The Apache Commons IO library contains utility classes, stream implementations, file filters,
-file comparators, endian transformation classes, and much more.
+The Apache Commons IO library contains utility classes, stream implementations,
+file filters, file comparators, endian transformation classes, and much more.
+
+Apache Commons IO 2.6 requires at least Java 7 to build and run.
+
+
+DEPRECATIONS
+============
+
+All closeQuietly overloads in org.apache.commons.io.IOUtils have been
+deprecated. Use the try-with-resources statement or handle suppressed
+exceptions manually.
+
+The class org.apache.commons.io.FileSystemUtils has been deprecated.
+Use equivalent methods in java.nio.file.FileStore instead, e.g.
+Files.getFileStore(Paths.get("/home")).getUsableSpace() or iterate over
+FileSystems.getDefault().getFileStores().
+
+
+COMPATIBILITY WITH JAVA 9
+==================
+
+The MANIFEST.MF now contains an additional entry:
+
+ Automatic-Module-Name: org.apache.commons.io
+
+This should make it possible to use Commons IO 2.6 as a module in the Java 9
+module system. For more information see the corresponding issue:
+
+ https://issues.apache.org/jira/browse/IO-551
+
+Building Commons IO 2.6 should work out of the box with the latest Java 9
+release. Please report any Java 9 related issues at:
+
+ https://issues.apache.org/jira/browse/IO
+
+
+NEW FEATURES
+============
+
+o IO-551: Add Automatic-Module-Name MANIFEST entry for Java 9 compatibility.
+o IO-367: Add convenience methods for copyToDirectory. Thanks to James Sawle.
+o IO-493: Add infinite circular input stream. Thanks to Piotr Turski.
+o IO-507: Add a ByteOrderUtils class.
+o IO-518: Add ObservableInputStream.
+o IO-519: Add MessageDigestCalculatingInputStream.
+o IO-513: Add convenience methods for reading class path resources.
+ Thanks to Behrang Saeedzadeh.
+
+FIXED BUGS
+==========
+
+o IO-546: ClosedOutputStream#flush should throw. Thanks to Tomas Celaya.
+o IO-550: Documentation issue, fix 404 Javadoc issues in the description page.
+ Thanks to Jimi Adrian.
+o IO-442: Javadoc contradictory for FileFilterUtils.ageFileFilter(cutoff) and
+ the filter it constructs: AgeFileFilter(cutoff).
+ Thanks to Simon Robinson.
+o IO-534: FileUtilTestCase.testForceDeleteDir() should not delete testDirectory
+ parent.
+o IO-528: Fix Tailer.run race condition runaway logging. Thanks to Dave Moten.
+o IO-483: getPrefixLength return -1 if unix file contains colon.
+ Thanks to Marko Vasic.
+o IO-520: FileUtilsTestCase#testContentEqualsIgnoreEOL fails on Windows.
+o IO-516: .gitattributes not correctly applied. Thanks to Jason Pyeron.
+o IO-515: Allow Specifying Initial Buffer Size of DeferredFileOutputStream.
+ Thanks to Brett Lounsbury, Gary Gregory.
+o IO-512: ThresholdingOutputStream.thresholdReached() results in
+ FileNotFoundException. Thanks to Ralf Hauser.
+o IO-511: After a few unit tests, a few newly created directories not cleaned
+ completely. Thanks to Ahmet Celik.
+o IO-502: Exceptions are suppressed incorrectly when copying files.
+ Thanks to Christian Schulte.
+o IO-503: Update platform requirement to Java 7.
+o IO-537: BOMInputStream shouldn't sort array of BOMs in-place.
+ Thanks to Borys Zibrov.
+
+CHANGES
+=======
+
+o IO-553: Make code style of hasBOM() consistent with getBOMCharsetName().
+ Thanks to Michael Ernst.
+o IO-542: FileUtils#readFileToByteArray: optimize reading of files with known
+ size. Thanks to Ilmars Poikans.
+o IO-547: Throw a IllegalArgumentException instead of NullPointerException in
+ FileSystemUtils.freeSpaceWindows(). Thanks to Nikhil Shinde,
+ Michael Ernst, Gary Greory.
+o IO-506: Deprecate methods FileSystemUtils.freeSpaceKb().
+ Thanks to Christian Schulte.
+o IO-505: Make LineIterator implement Closeable to support try-with-resources
+ statements. Thanks to Christian Schulte.
+o IO-504: Deprecated of all IOUtils.closeQuietly() methods and use
+ try-with-resources internally. Thanks to Christian Schulte.
+
+REMOVED
+=======
+
+o IO-514: Remove org.apache.commons.io.Java7Support.
+
+COMPATIBILITY WITH OLDER VERSIONS
+=================================
+
+Compatibility with 2.5:
+Binary compatible: Yes.
+Source compatible: Yes.
+Semantic compatible: Yes.
+
+Compatibility with 2.6 and 1.4:
+Binary compatible: Yes.
+Source compatible: No, see the rare case in
+ https://issues.apache.org/jira/browse/IO-318.
+Semantic compatible: No, see the rare case in
+ https://issues.apache.org/jira/browse/IO-318.
+
+Commons IO 2.6 requires JDK 1.7 or later.
+Commons IO 2.5 requires JDK 1.6 or later.
+Commons IO 2.4 requires JDK 1.6 or later.
+Commons IO 2.3 requires JDK 1.6 or later.
+Commons IO 2.2 requires JDK 1.5 or later.
+Commons IO 1.4 requires JDK 1.3 or later.
==============================================================================
Apache Commons IO Version 2.5
[04/19] commons-io git commit: FileAlterationMonitorTestCase and
FileAlterationObserverTestCase: use TemporaryFolder rule,
so that tests are independent
Posted by br...@apache.org.
FileAlterationMonitorTestCase and FileAlterationObserverTestCase: use TemporaryFolder rule, so that tests are independent
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/5e223a40
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/5e223a40
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/5e223a40
Branch: refs/heads/release
Commit: 5e223a403e65992d2d18b1b8cab5da2c6c1aa37d
Parents: 5f2c109
Author: pascalschumacher <pa...@gmx.net>
Authored: Sun Oct 1 14:49:28 2017 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Sun Oct 1 14:49:28 2017 +0200
----------------------------------------------------------------------
.../io/monitor/AbstractMonitorTestCase.java | 17 +++++++----------
.../io/monitor/FileAlterationMonitorTestCase.java | 1 -
.../io/monitor/FileAlterationObserverTestCase.java | 1 -
3 files changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/5e223a40/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java b/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java
index f10e286..aaedaaf 100644
--- a/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java
+++ b/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java
@@ -28,11 +28,16 @@ import org.apache.commons.io.filefilter.FileFilterUtils;
import org.apache.commons.io.filefilter.HiddenFileFilter;
import org.apache.commons.io.filefilter.IOFileFilter;
import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
/**
* {@link FileAlterationObserver} Test Case.
*/
-public abstract class AbstractMonitorTestCase {
+public abstract class AbstractMonitorTestCase {
+
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
/** File observer */
protected FileAlterationObserver observer;
@@ -40,9 +45,6 @@ public abstract class AbstractMonitorTestCase {
/** Listener which collects file changes */
protected CollectionFileListener listener;
- /** Test directory name */
- protected String testDirName = null;
-
/** Directory for test files */
protected File testDir;
@@ -51,12 +53,7 @@ public abstract class AbstractMonitorTestCase {
@Before
public void setUp() throws Exception {
- testDir = new File(new File("."), testDirName);
- if (testDir.exists()) {
- FileUtils.cleanDirectory(testDir);
- } else {
- testDir.mkdir();
- }
+ testDir = temporaryFolder.getRoot();
final IOFileFilter files = FileFilterUtils.fileFileFilter();
final IOFileFilter javaSuffix = FileFilterUtils.suffixFileFilter(".java");
http://git-wip-us.apache.org/repos/asf/commons-io/blob/5e223a40/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java b/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
index 6cfabe4..200f858 100644
--- a/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
+++ b/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
@@ -39,7 +39,6 @@ public class FileAlterationMonitorTestCase extends AbstractMonitorTestCase {
*
*/
public FileAlterationMonitorTestCase() {
- testDirName = "test-monitor";
listener = new CollectionFileListener(false);
}
http://git-wip-us.apache.org/repos/asf/commons-io/blob/5e223a40/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java b/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java
index cef9c18..e911bae 100644
--- a/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java
+++ b/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java
@@ -39,7 +39,6 @@ public class FileAlterationObserverTestCase extends AbstractMonitorTestCase {
*
*/
public FileAlterationObserverTestCase() {
- testDirName = "test-observer";
listener = new CollectionFileListener(true);
}
[15/19] commons-io git commit: Update download page in preparation
for 2.6 release
Posted by br...@apache.org.
Update download page in preparation for 2.6 release
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/a246ac80
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/a246ac80
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/a246ac80
Branch: refs/heads/release
Commit: a246ac809581b422fd18b4de086ebf120dd6ae8f
Parents: 5f88079
Author: Benedikt Ritter <br...@apache.org>
Authored: Wed Sep 27 21:57:35 2017 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sat Oct 14 14:00:44 2017 +0200
----------------------------------------------------------------------
src/site/xdoc/download_io.xml | 60 ++++++++++++++++++++++++--------------
1 file changed, 38 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/a246ac80/src/site/xdoc/download_io.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download_io.xml b/src/site/xdoc/download_io.xml
index bbb2565..b8718d8 100644
--- a/src/site/xdoc/download_io.xml
+++ b/src/site/xdoc/download_io.xml
@@ -31,10 +31,21 @@ limitations under the License.
| 2) Set the following properties in the component's pom: |
| - commons.componentid (required, alphabetic, lower case) |
| - commons.release.version (required) |
- | - commons.binary.suffix (optional) |
+ | - commons.release.name (required) |
+ | - commons.binary.suffix (optional) |
| (defaults to "-bin", set to "" for pre-maven2 releases) |
+ | - commons.release.desc (optional) |
+ | - commons.release.subdir (optional) |
+ | |
+ | - commons.release.2/3.version (conditional) |
+ | - commons.release.2/3.name (conditional) |
+ | - commons.release.2/3.binary.suffix (optional) |
+ | - commons.release.2/3.desc (optional) |
+ | - commons.release.2/3.subdir (optional) |
| |
| 3) Example Properties |
+ | (commons.release.name inherited by parent: |
+ | ${project.artifactId}-${commons.release.version} |
| |
| <properties> |
| <commons.componentid>math</commons.componentid> |
@@ -46,17 +57,17 @@ limitations under the License.
<document>
<properties>
<title>Download Apache Commons IO</title>
- <author email="dev@commons.apache.org">Commons Documentation Team</author>
+ <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
</properties>
<body>
<section name="Download Apache Commons IO">
<subsection name="Using a Mirror">
<p>
We recommend you use a mirror to download our release
- builds, but you <strong>must</strong> verify the integrity of
+ builds, but you <strong>must</strong> <a href="http://www.apache.org/info/verification.html">verify the integrity</a> of
the downloaded files using signatures downloaded from our main
distribution directories. Recent releases (48 hours) may not yet
- be available from the mirrors.
+ be available from all the mirrors.
</p>
<p>
@@ -88,39 +99,44 @@ limitations under the License.
</form>
<p>
- The <a href="http://www.apache.org/dist/commons/KEYS">KEYS</a>
- link links to the code signing keys used to sign the product.
- The <code>PGP</code> link downloads the OpenPGP compatible signature from our main site.
- The <code>MD5</code> link downloads the checksum from the main site.
+ It is essential that you
+ <a href="https://www.apache.org/info/verification.html">verify the integrity</a>
+ of downloaded files, preferably using the <code>PGP</code> signature (<code>*.asc</code> files);
+ failing that using the <code>MD5</code> hash (<code>*.md5</code> checksum files).
+ </p>
+ <p>
+ The <a href="https://www.apache.org/dist/commons/KEYS">KEYS</a>
+ file contains the public PGP keys used by Apache Commons developers
+ to sign releases.
</p>
</subsection>
</section>
- <section name="Apache Commons IO 2.5 (requires JDK 1.6+)">
+ <section name="Apache Commons IO 2.6 (requires JDK 1.7+)">
<subsection name="Binaries">
<table>
<tr>
- <td><a href="[preferred]/commons/io/binaries/commons-io-2.5-bin.tar.gz">commons-io-2.5-bin.tar.gz</a></td>
- <td><a href="http://www.apache.org/dist/commons/io/binaries/commons-io-2.5-bin.tar.gz.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/io/binaries/commons-io-2.5-bin.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/io/binaries/commons-io-2.6-bin.tar.gz">commons-io-2.6-bin.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/io/binaries/commons-io-2.6-bin.tar.gz.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/commons/io/binaries/commons-io-2.6-bin.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/io/binaries/commons-io-2.5-bin.zip">commons-io-2.5-bin.zip</a></td>
- <td><a href="http://www.apache.org/dist/commons/io/binaries/commons-io-2.5-bin.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/io/binaries/commons-io-2.5-bin.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/io/binaries/commons-io-2.6-bin.zip">commons-io-2.6-bin.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/io/binaries/commons-io-2.6-bin.zip.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/commons/io/binaries/commons-io-2.6-bin.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Source">
<table>
<tr>
- <td><a href="[preferred]/commons/io/source/commons-io-2.5-src.tar.gz">commons-io-2.5-src.tar.gz</a></td>
- <td><a href="http://www.apache.org/dist/commons/io/source/commons-io-2.5-src.tar.gz.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/io/source/commons-io-2.5-src.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/io/source/commons-io-2.6-src.tar.gz">commons-io-2.6-src.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/io/source/commons-io-2.6-src.tar.gz.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/commons/io/source/commons-io-2.6-src.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/io/source/commons-io-2.5-src.zip">commons-io-2.5-src.zip</a></td>
- <td><a href="http://www.apache.org/dist/commons/io/source/commons-io-2.5-src.zip.md5">md5</a></td>
- <td><a href="http://www.apache.org/dist/commons/io/source/commons-io-2.5-src.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/io/source/commons-io-2.6-src.zip">commons-io-2.6-src.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/io/source/commons-io-2.6-src.zip.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/commons/io/source/commons-io-2.6-src.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
@@ -131,7 +147,7 @@ limitations under the License.
</p>
<ul>
<li class="download"><a href="[preferred]/commons/io/">browse download area</a></li>
- <li><a href="http://archive.apache.org/dist/commons/io/">archives...</a></li>
+ <li><a href="https://archive.apache.org/dist/commons/io/">archives...</a></li>
</ul>
</section>
</body>
[03/19] commons-io git commit: add maven default goal (verify, rat,
clirr, checkstyle, javadoc) and run it on travis
Posted by br...@apache.org.
add maven default goal (verify, rat, clirr, checkstyle, javadoc) and run it on travis
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/5f2c1091
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/5f2c1091
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/5f2c1091
Branch: refs/heads/release
Commit: 5f2c10915331564afcdd97b338f87b1dd96d52e4
Parents: 863808f
Author: pascalschumacher <pa...@gmx.net>
Authored: Sun Oct 1 14:08:14 2017 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Sun Oct 1 14:08:14 2017 +0200
----------------------------------------------------------------------
.travis.yml | 2 +-
pom.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/5f2c1091/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 2a591a6..be7c71f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ jdk:
- oraclejdk8
script:
- - mvn test apache-rat:check clirr:check checkstyle:check javadoc:javadoc
+ - mvn
after_success:
- mvn clean cobertura:cobertura coveralls:report
http://git-wip-us.apache.org/repos/asf/commons-io/blob/5f2c1091/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7a7766d..0c1db03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -266,6 +266,7 @@ file comparators, endian transformation classes, and much more.
</properties>
<build>
+ <defaultGoal>clean verify apache-rat:check clirr:check checkstyle:check javadoc:javadoc</defaultGoal>
<pluginManagement>
<plugins>
<plugin>
[17/19] commons-io git commit: Update auto generated files
Posted by br...@apache.org.
Update auto generated files
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/78fc6c76
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/78fc6c76
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/78fc6c76
Branch: refs/heads/release
Commit: 78fc6c76d47aebb97ca625eb8f3f71be9176111d
Parents: 84a5fcf
Author: Benedikt Ritter <br...@apache.org>
Authored: Sat Sep 30 16:19:56 2017 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sat Oct 14 14:04:01 2017 +0200
----------------------------------------------------------------------
CONTRIBUTING.md | 40 +++++++++++++++++++++++++----------
README.md | 22 +++++++++++--------
src/site/xdoc/issue-tracking.xml | 30 +++++++++++++-------------
3 files changed, 57 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/78fc6c76/CONTRIBUTING.md
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 11e9dd7..bd76d94 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -51,47 +51,65 @@ Getting Started
+ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
+ Make sure you have a [GitHub account](https://github.com/signup/free).
+ If you're planning to implement a new feature it makes sense to discuss you're changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Commons IO's scope.
-+ Submit a ticket for your issue, assuming one does not already exist.
++ Submit a [Jira Ticket][jira] for your issue, assuming one does not already exist.
+ Clearly describe the issue including steps to reproduce when it is a bug.
+ Make sure you fill in the earliest version that you know has the issue.
-+ Fork the repository on GitHub.
++ Find the corresponding [repository on GitHub](https://github.com/apache/?query=commons-),
+[fork](https://help.github.com/articles/fork-a-repo/) and check out your forked repository.
Making Changes
--------------
-+ Create a topic branch from where you want to base your work (this is usually the master/trunk branch).
++ Create a _topic branch_ for your isolated work.
+ * Usually you should base your branch on the `master` or `trunk` branch.
+ * A good topic branch name can be the JIRA bug id plus a keyword, e.g. `IO-123-InputStream`.
+ * If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests.
+ Make commits of logical units.
+ * Make sure your commit messages are meaningful and in the proper format. Your commit message should contain the key of the JIRA issue.
+ * e.g. `IO-123: Close input stream earlier`
+ Respect the original code style:
+ Only use spaces for indentation.
- + Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change.
- + Check for unnecessary whitespace with git diff --check before committing.
-+ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
-+ Make sure you have added the necessary tests for your changes.
+ + Create minimal diffs - disable _On Save_ actions like _Reformat Source Code_ or _Organize Imports_. If you feel the source code should be reformatted create a separate PR for this change first.
+ + Check for unnecessary whitespace with `git diff` -- check before committing.
++ Make sure you have added the necessary tests for your changes, typically in `src/test/java`.
+ Run all the tests with `mvn clean verify` to assure nothing else was accidentally broken.
Making Trivial Changes
----------------------
+The JIRA tickets are used to generate the changelog for the next release.
+
For changes of a trivial nature to comments and documentation, it is not always necessary to create a new ticket in JIRA.
In this case, it is appropriate to start the first line of a commit with '(doc)' instead of a ticket number.
+
Submitting Changes
------------------
-+ Sign the [Contributor License Agreement][cla] if you haven't already.
++ Sign and submit the Apache [Contributor License Agreement][cla] if you haven't already.
+ * Note that small patches & typical bug fixes do not require a CLA as
+ clause 5 of the [Apache License](https://www.apache.org/licenses/LICENSE-2.0.html#contributions)
+ covers them.
+ Push your changes to a topic branch in your fork of the repository.
-+ Submit a pull request to the repository in the apache organization.
++ Submit a _Pull Request_ to the corresponding repository in the `apache` organization.
+ * Verify _Files Changed_ shows only your intended changes and does not
+ include additional files like `target/*.class`
+ Update your JIRA ticket and include a link to the pull request in the ticket.
+If you prefer to not use GitHub, then you can instead use
+`git format-patch` (or `svn diff`) and attach the patch file to the JIRA issue.
+
+
Additional Resources
--------------------
+ [Contributing patches](https://commons.apache.org/patches.html)
-+ [Apache Commons IO JIRA project page](https://issues.apache.org/jira/browse/IO)
++ [Apache Commons IO JIRA project page][jira]
+ [Contributor License Agreement][cla]
+ [General GitHub documentation](https://help.github.com/)
+ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
+ [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
-+ #apachecommons IRC channel on freenode.org
++ `#apache-commons` IRC channel on `irc.freenode.net`
[cla]:https://www.apache.org/licenses/#clas
+[jira]:https://issues.apache.org/jira/browse/IO
http://git-wip-us.apache.org/repos/asf/commons-io/blob/78fc6c76/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index fc28d5f..3417ae4 100644
--- a/README.md
+++ b/README.md
@@ -44,15 +44,17 @@ Apache Commons IO
===================
[](https://travis-ci.org/apache/commons-io)
-[](https://coveralls.io/github/apache/commons-io?branch=master)
+[](https://coveralls.io/r/apache/commons-io)
+[](https://maven-badges.herokuapp.com/maven-central/commons-io/commons-io/)
+[](http://www.apache.org/licenses/LICENSE-2.0.html)
-The Apache Commons IO library contains utility classes, stream implementations, file filters,
+The Apache Commons IO library contains utility classes, stream implementations, file filters,
file comparators, endian transformation classes, and much more.
Documentation
-------------
-More information can be found on the [homepage](https://commons.apache.org/proper/commons-io).
+More information can be found on the [Apache Commons IO homepage](https://commons.apache.org/proper/commons-io).
The [JavaDoc](https://commons.apache.org/proper/commons-io/javadocs/api-release) can be browsed.
Questions related to the usage of Apache Commons IO should be posted to the [user mailing list][ml].
@@ -66,14 +68,14 @@ Alternatively you can pull it from the central Maven repositories:
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
```
Contributing
------------
-We accept PRs via github. The [developer mailing list][ml] is the main channel of communication for contributors.
+We accept Pull Requests via GitHub. The [developer mailing list][ml] is the main channel of communication for contributors.
There are some guidelines which will make applying PRs easier for us:
+ No tabs! Please use spaces for indentation.
+ Respect the code style.
@@ -85,7 +87,9 @@ You can learn more about contributing via GitHub in our [contribution guidelines
License
-------
-Code is under the [Apache Licence v2](https://www.apache.org/licenses/LICENSE-2.0.txt).
+This code is under the [Apache Licence v2](https://www.apache.org/licenses/LICENSE-2.0).
+
+See the `NOTICE.txt` file for required notices and attributions.
Donations
---------
@@ -94,9 +98,9 @@ You like Apache Commons IO? Then [donate back to the ASF](https://www.apache.org
Additional Resources
--------------------
-+ [Apache Commons IO Homepage](https://commons.apache.org/proper/commons-io/)
-+ [Apache Commons IO Bugtracker (JIRA)](https://issues.apache.org/jira/browse/IO)
++ [Apache Commons Homepage](https://commons.apache.org/)
++ [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/IO)
+ [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
-+ #apachecommons IRC channel on freenode.org
++ `#apache-commons` IRC channel on `irc.freenode.org`
[ml]:https://commons.apache.org/mail-lists.html
http://git-wip-us.apache.org/repos/asf/commons-io/blob/78fc6c76/src/site/xdoc/issue-tracking.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml
index 9e05944..6b0c6d6 100644
--- a/src/site/xdoc/issue-tracking.xml
+++ b/src/site/xdoc/issue-tracking.xml
@@ -43,35 +43,35 @@ limitations under the License.
-->
<document>
<properties>
- <title>Commons IO Issue tracking</title>
- <author email="dev@commons.apache.org">Commons Documentation Team</author>
+ <title>Apache Commons IO Issue tracking</title>
+ <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
</properties>
<body>
- <section name="Commons IO Issue tracking">
+ <section name="Apache Commons IO Issue tracking">
<p>
- Commons IO uses <a href="http://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.
- See the <a href="http://issues.apache.org/jira/browse/IO">Commons IO JIRA project page</a>.
+ Apache Commons IO uses <a href="https://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.
+ See the <a href="https://issues.apache.org/jira/browse/IO">Apache Commons IO JIRA project page</a>.
</p>
<p>
- To use JIRA you may need to <a href="http://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
+ To use JIRA you may need to <a href="https://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
(if you have previously created/updated Commons issues using Bugzilla an account will have been automatically
- created and you can use the <a href="http://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a>
+ created and you can use the <a href="https://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a>
page to get a new password).
</p>
<p>
If you would like to report a bug, or raise an enhancement request with
- Commons IO please do the following:
+ Apache Commons IO please do the following:
<ol>
- <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310477&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">Search existing open bugs</a>.
+ <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310477&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">Search existing open bugs</a>.
If you find your issue listed then please add a comment with your details.</li>
<li><a href="mail-lists.html">Search the mailing list archive(s)</a>.
You may find your issue or idea has already been discussed.</li>
<li>Decide if your issue is a bug or an enhancement.</li>
- <li>Submit either a <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310477&issuetype=1&priority=4&assignee=-1">bug report</a>
- or <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310477&issuetype=4&priority=4&assignee=-1">enhancement request</a>.</li>
+ <li>Submit either a <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310477&issuetype=1&priority=4&assignee=-1">bug report</a>
+ or <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310477&issuetype=4&priority=4&assignee=-1">enhancement request</a>.</li>
</ol>
</p>
@@ -80,7 +80,7 @@ limitations under the License.
<ul>
<li>the more information you provide, the better we can help you</li>
<li>test cases are vital, particularly for any proposed enhancements</li>
- <li>the developers of Commons IO are all unpaid volunteers</li>
+ <li>the developers of Apache Commons IO are all unpaid volunteers</li>
</ul>
</p>
@@ -92,9 +92,9 @@ limitations under the License.
<p>
You may also find these links useful:
<ul>
- <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310477&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">All Open Commons IO bugs</a></li>
- <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310477&sorter/field=issuekey&sorter/order=DESC&status=5&status=6">All Resolved Commons IO bugs</a></li>
- <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310477&sorter/field=issuekey&sorter/order=DESC">All Commons IO bugs</a></li>
+ <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310477&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">All Open Apache Commons IO bugs</a></li>
+ <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310477&sorter/field=issuekey&sorter/order=DESC&status=5&status=6">All Resolved Apache Commons IO bugs</a></li>
+ <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310477&sorter/field=issuekey&sorter/order=DESC">All Apache Commons IO bugs</a></li>
</ul>
</p>
</section>
[19/19] commons-io git commit: Update version numbers for Commons IO
release 2.6
Posted by br...@apache.org.
Update version numbers for Commons IO release 2.6
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/a2190817
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/a2190817
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/a2190817
Branch: refs/heads/release
Commit: a219081780bb1714876ef3e1109283b96f3b007b
Parents: 2784633
Author: Benedikt Ritter <br...@apache.org>
Authored: Sat Sep 30 16:33:46 2017 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Sat Oct 14 14:04:02 2017 +0200
----------------------------------------------------------------------
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/a2190817/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d1dd3e8..754225f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6-SNAPSHOT</version>
+ <version>2.6</version>
<name>Apache Commons IO</name>
<inceptionYear>2002</inceptionYear>
@@ -52,6 +52,7 @@ file comparators, endian transformation classes, and much more.
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/commons-io.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/commons-io.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=commons-io.git</url>
+ <tag>commons-io-2.6</tag>
</scm>
<developers>
[14/19] commons-io git commit: Merge branch 'IO-553'
Posted by br...@apache.org.
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 <br...@apache.org>
Authored: Sat Oct 14 13:58:29 2017 +0200
Committer: Benedikt Ritter <br...@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
----------------------------------------------------------------------
[08/19] commons-io git commit: IO-546: ClosedOutputStream#flush
should throw (closes #42)
Posted by br...@apache.org.
IO-546: ClosedOutputStream#flush should throw (closes #42)
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/8d5c46f4
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/8d5c46f4
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/8d5c46f4
Branch: refs/heads/release
Commit: 8d5c46f420fe3f7365579aabc8b40912a3610957
Parents: 43720d0
Author: Tomas Celaya <tj...@gmail.com>
Authored: Fri Aug 18 11:47:20 2017 -0700
Committer: pascalschumacher <pa...@gmx.net>
Committed: Fri Oct 13 18:37:50 2017 +0200
----------------------------------------------------------------------
.../apache/commons/io/output/ClosedOutputStream.java | 9 +++++++++
.../commons/io/output/ClosedOutputStreamTest.java | 14 ++++++++++++++
2 files changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/8d5c46f4/src/main/java/org/apache/commons/io/output/ClosedOutputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/io/output/ClosedOutputStream.java b/src/main/java/org/apache/commons/io/output/ClosedOutputStream.java
index 0dbea9c..90b56db 100644
--- a/src/main/java/org/apache/commons/io/output/ClosedOutputStream.java
+++ b/src/main/java/org/apache/commons/io/output/ClosedOutputStream.java
@@ -47,4 +47,13 @@ public class ClosedOutputStream extends OutputStream {
throw new IOException("write(" + b + ") failed: stream is closed");
}
+ /**
+ * Throws an {@link IOException} to indicate that the stream is closed.
+ *
+ * @throws IOException always thrown
+ */
+ @Override
+ public void flush() throws IOException {
+ throw new IOException("flush() failed: stream is closed");
+ }
}
http://git-wip-us.apache.org/repos/asf/commons-io/blob/8d5c46f4/src/test/java/org/apache/commons/io/output/ClosedOutputStreamTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/io/output/ClosedOutputStreamTest.java b/src/test/java/org/apache/commons/io/output/ClosedOutputStreamTest.java
index 1735461..45e3cab 100644
--- a/src/test/java/org/apache/commons/io/output/ClosedOutputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/output/ClosedOutputStreamTest.java
@@ -41,4 +41,18 @@ public class ClosedOutputStreamTest {
}
}
+ /**
+ * Test the <code>flush()</code> method.
+ * @throws Exception
+ */
+ @Test
+ public void testFlush() throws Exception {
+ try (ClosedOutputStream cos = new ClosedOutputStream()) {
+ cos.flush();
+ fail("flush()");
+ } catch (final IOException e) {
+ // expected
+ }
+ }
+
}
[05/19] commons-io git commit: fix javadoc errors reported by java 9
Posted by br...@apache.org.
fix javadoc errors reported by java 9
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/c898e483
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/c898e483
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/c898e483
Branch: refs/heads/release
Commit: c898e483939740e706157b63b32cbe6f08a931a5
Parents: 5e223a4
Author: pascalschumacher <pa...@gmx.net>
Authored: Sun Oct 1 15:38:00 2017 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Sun Oct 1 15:38:00 2017 +0200
----------------------------------------------------------------------
.../apache/commons/io/comparator/package.html | 260 +++++++++----------
.../apache/commons/io/filefilter/package.html | 8 +-
.../commons/io/input/ReaderInputStream.java | 2 +-
3 files changed, 131 insertions(+), 139 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/c898e483/src/main/java/org/apache/commons/io/comparator/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/io/comparator/package.html b/src/main/java/org/apache/commons/io/comparator/package.html
index d007158..fa66bb0 100644
--- a/src/main/java/org/apache/commons/io/comparator/package.html
+++ b/src/main/java/org/apache/commons/io/comparator/package.html
@@ -35,11 +35,9 @@ for {@link java.io.File}s.
<p>
...alternatively you can do this in one line:
</p>
-<p>
- <pre>
- File[] files = NameFileComparator.NAME_COMPARATOR.sort(dir.listFiles());
- </pre>
-</p>
+<pre>
+ File[] files = NameFileComparator.NAME_COMPARATOR.sort(dir.listFiles());
+</pre>
<h3>Composite Comparator</h3>
<p>
@@ -50,139 +48,137 @@ for {@link java.io.File}s.
For example, to sort an array of files by type (i.e. directory or file)
and then by name:
</p>
-<p>
- <pre>
- CompositeFileComparator comparator =
- new CompositeFileComparator(
- DirectoryFileComparator.DIRECTORY_COMPARATOR,
- NameFileComparator.NAME_COMPARATOR);
- File[] files = dir.listFiles();
- comparator.sort(files);
- </pre>
-</p>
+<pre>
+ CompositeFileComparator comparator =
+ new CompositeFileComparator(
+ DirectoryFileComparator.DIRECTORY_COMPARATOR,
+ NameFileComparator.NAME_COMPARATOR);
+ File[] files = dir.listFiles();
+ comparator.sort(files);
+</pre>
<h3>Singleton Instances (thread-safe)</h3>
<p>
The {@link java.util.Comparator} implementations have some <i>convenience</i>
singleton(<i>thread-safe</i>) instances ready to use:
- <ul>
- <li><a href="DefaultFileComparator.html">DefaultFileComparator</a> - default file compare:
- <ul>
- <li><a href="DefaultFileComparator.html#DEFAULT_COMPARATOR">DEFAULT_COMPARATOR</a>
- - Compare using <code>File.compareTo(File)</code> method.
- </li>
- <li><a href="DefaultFileComparator.html#DEFAULT_REVERSE">DEFAULT_REVERSE</a>
- - Reverse compare of <code>File.compareTo(File)</code> method.
- </li>
- </ul>
- </li>
- <li><a href="DirectoryFileComparator.html">DirectoryFileComparator</a> - compare by type (directory or file):
- <ul>
- <li><a href="DirectoryFileComparator.html#DIRECTORY_COMPARATOR">DIRECTORY_COMPARATOR</a>
- - Compare using <code>File.isDirectory()</code> method (directories < files).
- </li>
- <li><a href="DirectoryFileComparator.html#DIRECTORY_REVERSE">DIRECTORY_REVERSE</a>
- - Reverse compare of <code>File.isDirectory()</code> method (directories > files).
- </li>
- </ul>
- </li>
- <li><a href="ExtensionFileComparator.html">ExtensionFileComparator</a> - compare file extenstions:
- <ul>
- <li><a href="ExtensionFileComparator.html#EXTENSION_COMPARATOR">EXTENSION_COMPARATOR</a>
- - Compare using <code>FilenameUtils.getExtension(String)</code> method.
- </li>
- <li><a href="ExtensionFileComparator.html#EXTENSION_REVERSE">EXTENSION_REVERSE</a>
- - Reverse compare of <code>FilenameUtils.getExtension(String)</code> method.
- </li>
- <li><a href="ExtensionFileComparator.html#EXTENSION_INSENSITIVE_COMPARATOR">EXTENSION_INSENSITIVE_COMPARATOR</a>
- - Case-insensitive compare using <code>FilenameUtils.getExtension(String)</code> method.
- </li>
- <li><a href="ExtensionFileComparator.html#EXTENSION_INSENSITIVE_REVERSE">EXTENSION_INSENSITIVE_REVERSE</a>
- - Reverse case-insensitive compare of <code>FilenameUtils.getExtension(String)</code> method.
- </li>
- <li><a href="ExtensionFileComparator.html#EXTENSION_SYSTEM_COMPARATOR">EXTENSION_SYSTEM_COMPARATOR</a>
- - System sensitive compare using <code>FilenameUtils.getExtension(String)</code> method.
- </li>
- <li><a href="ExtensionFileComparator.html#EXTENSION_SYSTEM_REVERSE">EXTENSION_SYSTEM_REVERSE</a>
- - Reverse system sensitive compare of <code>FilenameUtils.getExtension(String)</code> method.
- </li>
- </ul>
- </li>
- <li><a href="LastModifiedFileComparator.html">LastModifiedFileComparator</a>
- - compare the file's last modified date/time:
- <ul>
- <li><a href="LastModifiedFileComparator.html#LASTMODIFIED_COMPARATOR">LASTMODIFIED_COMPARATOR</a>
- - Compare using <code>File.lastModified()</code> method.
- </li>
- <li><a href="LastModifiedFileComparator.html#LASTMODIFIED_REVERSE">LASTMODIFIED_REVERSE</a>
- - Reverse compare of <code>File.lastModified()</code> method.
- </li>
- </ul>
- </li>
- <li><a href="NameFileComparator.html">NameFileComparator</a> - compare file names:
- <ul>
- <li><a href="NameFileComparator.html#NAME_COMPARATOR">NAME_COMPARATOR</a>
- - Compare using <code>File.getName()</code> method.
- </li>
- <li><a href="NameFileComparator.html#NAME_REVERSE">NAME_REVERSE</a>
- - Reverse compare of <code>File.getName()</code> method.
- </li>
- <li><a href="NameFileComparator.html#NAME_INSENSITIVE_COMPARATOR">NAME_INSENSITIVE_COMPARATOR</a>
- - Case-insensitive compare using <code>File.getName()</code> method.
- </li>
- <li><a href="NameFileComparator.html#NAME_INSENSITIVE_REVERSE">NAME_INSENSITIVE_REVERSE</a>
- - Reverse case-insensitive compare of <code>File.getName()</code> method.
- </li>
- <li><a href="NameFileComparator.html#NAME_SYSTEM_COMPARATOR">NAME_SYSTEM_COMPARATOR</a>
- - System sensitive compare using <code>File.getName()</code> method.
- </li>
- <li><a href="NameFileComparator.html#NAME_SYSTEM_REVERSE">NAME_SYSTEM_REVERSE</a>
- - Reverse system sensitive compare of <code>File.getName()</code> method.
- </li>
- </ul>
- </li>
- <li><a href="PathFileComparator.html">PathFileComparator</a> - compare file paths:
- <ul>
- <li><a href="PathFileComparator.html#PATH_COMPARATOR">PATH_COMPARATOR</a>
- - Compare using <code>File.getPath()</code> method.
- </li>
- <li><a href="PathFileComparator.html#PATH_REVERSE">PATH_REVERSE</a>
- - Reverse compare of <code>File.getPath()</code> method.
- </li>
- <li><a href="PathFileComparator.html#PATH_INSENSITIVE_COMPARATOR">PATH_INSENSITIVE_COMPARATOR</a>
- - Case-insensitive compare using <code>File.getPath()</code> method.
- </li>
- <li><a href="PathFileComparator.html#PATH_INSENSITIVE_REVERSE">PATH_INSENSITIVE_REVERSE</a>
- - Reverse case-insensitive compare of <code>File.getPath()</code> method.
- </li>
- <li><a href="PathFileComparator.html#PATH_SYSTEM_COMPARATOR">PATH_SYSTEM_COMPARATOR</a>
- - System sensitive compare using <code>File.getPath()</code> method.
- </li>
- <li><a href="PathFileComparator.html#PATH_SYSTEM_REVERSE">PATH_SYSTEM_REVERSE</a>
- - Reverse system sensitive compare of <code>File.getPath()</code> method.
- </li>
- </ul>
- </li>
- <li><a href="SizeFileComparator.html">SizeFileComparator</a> - compare the file's size:
- <ul>
- <li><a href="SizeFileComparator.html#SIZE_COMPARATOR">SIZE_COMPARATOR</a>
- - Compare using <code>File.length()</code> method (directories treated as zero length).
- </li>
- <li><a href="SizeFileComparator.html#SIZE_REVERSE">LASTMODIFIED_REVERSE</a>
- - Reverse compare of <code>File.length()</code> method (directories treated as zero length).
- </li>
- <li><a href="SizeFileComparator.html#SIZE_SUMDIR_COMPARATOR">SIZE_SUMDIR_COMPARATOR</a>
- - Compare using <code>FileUtils.sizeOfDirectory(File)</code> method
- (sums the size of a directory's contents).
- </li>
- <li><a href="SizeFileComparator.html#SIZE_SUMDIR_REVERSE">SIZE_SUMDIR_REVERSE</a>
- - Reverse compare of <code>FileUtils.sizeOfDirectory(File)</code> method
- (sums the size of a directory's contents).
- </li>
- </ul>
- </li>
- </ul>
</p>
+<ul>
+ <li><a href="DefaultFileComparator.html">DefaultFileComparator</a> - default file compare:
+ <ul>
+ <li><a href="DefaultFileComparator.html#DEFAULT_COMPARATOR">DEFAULT_COMPARATOR</a>
+ - Compare using <code>File.compareTo(File)</code> method.
+ </li>
+ <li><a href="DefaultFileComparator.html#DEFAULT_REVERSE">DEFAULT_REVERSE</a>
+ - Reverse compare of <code>File.compareTo(File)</code> method.
+ </li>
+ </ul>
+ </li>
+ <li><a href="DirectoryFileComparator.html">DirectoryFileComparator</a> - compare by type (directory or file):
+ <ul>
+ <li><a href="DirectoryFileComparator.html#DIRECTORY_COMPARATOR">DIRECTORY_COMPARATOR</a>
+ - Compare using <code>File.isDirectory()</code> method (directories < files).
+ </li>
+ <li><a href="DirectoryFileComparator.html#DIRECTORY_REVERSE">DIRECTORY_REVERSE</a>
+ - Reverse compare of <code>File.isDirectory()</code> method (directories >files).
+ </li>
+ </ul>
+ </li>
+ <li><a href="ExtensionFileComparator.html">ExtensionFileComparator</a> - compare file extenstions:
+ <ul>
+ <li><a href="ExtensionFileComparator.html#EXTENSION_COMPARATOR">EXTENSION_COMPARATOR</a>
+ - Compare using <code>FilenameUtils.getExtension(String)</code> method.
+ </li>
+ <li><a href="ExtensionFileComparator.html#EXTENSION_REVERSE">EXTENSION_REVERSE</a>
+ - Reverse compare of <code>FilenameUtils.getExtension(String)</code> method.
+ </li>
+ <li><a href="ExtensionFileComparator.html#EXTENSION_INSENSITIVE_COMPARATOR">EXTENSION_INSENSITIVE_COMPARATOR</a>
+ - Case-insensitive compare using <code>FilenameUtils.getExtension(String)</code> method.
+ </li>
+ <li><a href="ExtensionFileComparator.html#EXTENSION_INSENSITIVE_REVERSE">EXTENSION_INSENSITIVE_REVERSE</a>
+ - Reverse case-insensitive compare of <code>FilenameUtils.getExtension(String)</code> method.
+ </li>
+ <li><a href="ExtensionFileComparator.html#EXTENSION_SYSTEM_COMPARATOR">EXTENSION_SYSTEM_COMPARATOR</a>
+ - System sensitive compare using <code>FilenameUtils.getExtension(String)</code> method.
+ </li>
+ <li><a href="ExtensionFileComparator.html#EXTENSION_SYSTEM_REVERSE">EXTENSION_SYSTEM_REVERSE</a>
+ - Reverse system sensitive compare of <code>FilenameUtils.getExtension(String)</code> method.
+ </li>
+ </ul>
+ </li>
+ <li><a href="LastModifiedFileComparator.html">LastModifiedFileComparator</a>
+ - compare the file's last modified date/time:
+ <ul>
+ <li><a href="LastModifiedFileComparator.html#LASTMODIFIED_COMPARATOR">LASTMODIFIED_COMPARATOR</a>
+ - Compare using <code>File.lastModified()</code> method.
+ </li>
+ <li><a href="LastModifiedFileComparator.html#LASTMODIFIED_REVERSE">LASTMODIFIED_REVERSE</a>
+ - Reverse compare of <code>File.lastModified()</code> method.
+ </li>
+ </ul>
+ </li>
+ <li><a href="NameFileComparator.html">NameFileComparator</a> - compare file names:
+ <ul>
+ <li><a href="NameFileComparator.html#NAME_COMPARATOR">NAME_COMPARATOR</a>
+ - Compare using <code>File.getName()</code> method.
+ </li>
+ <li><a href="NameFileComparator.html#NAME_REVERSE">NAME_REVERSE</a>
+ - Reverse compare of <code>File.getName()</code> method.
+ </li>
+ <li><a href="NameFileComparator.html#NAME_INSENSITIVE_COMPARATOR">NAME_INSENSITIVE_COMPARATOR</a>
+ - Case-insensitive compare using <code>File.getName()</code> method.
+ </li>
+ <li><a href="NameFileComparator.html#NAME_INSENSITIVE_REVERSE">NAME_INSENSITIVE_REVERSE</a>
+ - Reverse case-insensitive compare of <code>File.getName()</code> method.
+ </li>
+ <li><a href="NameFileComparator.html#NAME_SYSTEM_COMPARATOR">NAME_SYSTEM_COMPARATOR</a>
+ - System sensitive compare using <code>File.getName()</code> method.
+ </li>
+ <li><a href="NameFileComparator.html#NAME_SYSTEM_REVERSE">NAME_SYSTEM_REVERSE</a>
+ - Reverse system sensitive compare of <code>File.getName()</code> method.
+ </li>
+ </ul>
+ </li>
+ <li><a href="PathFileComparator.html">PathFileComparator</a> - compare file paths:
+ <ul>
+ <li><a href="PathFileComparator.html#PATH_COMPARATOR">PATH_COMPARATOR</a>
+ - Compare using <code>File.getPath()</code> method.
+ </li>
+ <li><a href="PathFileComparator.html#PATH_REVERSE">PATH_REVERSE</a>
+ - Reverse compare of <code>File.getPath()</code> method.
+ </li>
+ <li><a href="PathFileComparator.html#PATH_INSENSITIVE_COMPARATOR">PATH_INSENSITIVE_COMPARATOR</a>
+ - Case-insensitive compare using <code>File.getPath()</code> method.
+ </li>
+ <li><a href="PathFileComparator.html#PATH_INSENSITIVE_REVERSE">PATH_INSENSITIVE_REVERSE</a>
+ - Reverse case-insensitive compare of <code>File.getPath()</code> method.
+ </li>
+ <li><a href="PathFileComparator.html#PATH_SYSTEM_COMPARATOR">PATH_SYSTEM_COMPARATOR</a>
+ - System sensitive compare using <code>File.getPath()</code> method.
+ </li>
+ <li><a href="PathFileComparator.html#PATH_SYSTEM_REVERSE">PATH_SYSTEM_REVERSE</a>
+ - Reverse system sensitive compare of <code>File.getPath()</code> method.
+ </li>
+ </ul>
+ </li>
+ <li><a href="SizeFileComparator.html">SizeFileComparator</a> - compare the file's size:
+ <ul>
+ <li><a href="SizeFileComparator.html#SIZE_COMPARATOR">SIZE_COMPARATOR</a>
+ - Compare using <code>File.length()</code> method (directories treated as zero length).
+ </li>
+ <li><a href="SizeFileComparator.html#SIZE_REVERSE">LASTMODIFIED_REVERSE</a>
+ - Reverse compare of <code>File.length()</code> method (directories treated as zero length).
+ </li>
+ <li><a href="SizeFileComparator.html#SIZE_SUMDIR_COMPARATOR">SIZE_SUMDIR_COMPARATOR</a>
+ - Compare using <code>FileUtils.sizeOfDirectory(File)</code> method
+ (sums the size of a directory's contents).
+ </li>
+ <li><a href="SizeFileComparator.html#SIZE_SUMDIR_REVERSE">SIZE_SUMDIR_REVERSE</a>
+ - Reverse compare of <code>FileUtils.sizeOfDirectory(File)</code> method
+ (sums the size of a directory's contents).
+ </li>
+ </ul>
+ </li>
+</ul>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/commons-io/blob/c898e483/src/main/java/org/apache/commons/io/filefilter/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/io/filefilter/package.html b/src/main/java/org/apache/commons/io/filefilter/package.html
index e495e95..e32a192 100644
--- a/src/main/java/org/apache/commons/io/filefilter/package.html
+++ b/src/main/java/org/apache/commons/io/filefilter/package.html
@@ -24,10 +24,8 @@ IOFileFilter interface including implementation that allow you to combine
other such filters.</p>
<p>These filter can be used to list files or in {@link java.awt.FileDialog},
for example.</p>
-
-<p>There are a number of 'primitive' filters:</p>
-
<table>
+ <caption>There are a number of 'primitive' filters:</caption>
<tbody>
<tr>
<td><a href="DirectoryFileFilter.html">DirectoryFilter</a></td>
@@ -59,10 +57,8 @@ for example.</p>
</tr>
</tbody>
</table>
-
-<p>And there are five 'boolean' filters:</p>
-
<table>
+ <caption>And there are five 'boolean' filters:</caption>
<tbody>
<tr>
<td><a href="TrueFileFilter.html">TrueFileFilter</a></td>
http://git-wip-us.apache.org/repos/asf/commons-io/blob/c898e483/src/main/java/org/apache/commons/io/input/ReaderInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/io/input/ReaderInputStream.java b/src/main/java/org/apache/commons/io/input/ReaderInputStream.java
index b8e151f..41ed2d4 100644
--- a/src/main/java/org/apache/commons/io/input/ReaderInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/ReaderInputStream.java
@@ -62,7 +62,7 @@ import java.nio.charset.CodingErrorAction;
* in the design of the code. This class is typically used in situations where an existing
* API only accepts an {@link InputStream}, but where the most natural way to produce the data
* is as a character stream, i.e. by providing a {@link Reader} instance. An example of a situation
- * where this problem may appear is when implementing the {@link javax.activation.DataSource}
+ * where this problem may appear is when implementing the {@code javax.activation.DataSource}
* interface from the Java Activation Framework.
* <p>
* Given the fact that the {@link Reader} class doesn't provide any way to predict whether the next
[02/19] commons-io git commit: add javadoc comment to ByteOrderUtils
constructor (fixes checkstyle violation)
Posted by br...@apache.org.
add javadoc comment to ByteOrderUtils constructor (fixes checkstyle violation)
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/863808f1
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/863808f1
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/863808f1
Branch: refs/heads/release
Commit: 863808f1b8359ab9a79b206cf743db728ac17d48
Parents: 928da12
Author: pascalschumacher <pa...@gmx.net>
Authored: Sun Oct 1 14:04:52 2017 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Sun Oct 1 14:04:52 2017 +0200
----------------------------------------------------------------------
src/main/java/org/apache/commons/io/ByteOrderUtils.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/863808f1/src/main/java/org/apache/commons/io/ByteOrderUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/io/ByteOrderUtils.java b/src/main/java/org/apache/commons/io/ByteOrderUtils.java
index e7a66f5..96ca446 100644
--- a/src/main/java/org/apache/commons/io/ByteOrderUtils.java
+++ b/src/main/java/org/apache/commons/io/ByteOrderUtils.java
@@ -39,6 +39,9 @@ public final class ByteOrderUtils {
*/
public static final String LITTLE_ENDIAN = "Little";
+ /**
+ * ByteOrderUtils is a static utility class, so prevent construction with a private constructor.
+ */
private ByteOrderUtils() {
}
[09/19] commons-io git commit: IO-546: ClosedOutputStream#flush
should throw
Posted by br...@apache.org.
IO-546: ClosedOutputStream#flush should throw
add changes.xml entry
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/fa24ac8a
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/fa24ac8a
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/fa24ac8a
Branch: refs/heads/release
Commit: fa24ac8a655c30c4b88bd51ce690d0184c342d47
Parents: 8d5c46f
Author: pascalschumacher <pa...@gmx.net>
Authored: Fri Oct 13 18:43:03 2017 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Fri Oct 13 18:43:03 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/fa24ac8a/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a1d39a7..6372483 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -47,6 +47,9 @@ The <action> type attribute can be add,update,fix,remove.
<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-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>
[06/19] commons-io git commit: pom.xml: add profile that allows build
on java 9
Posted by br...@apache.org.
pom.xml: add profile that allows build on java 9
.travis.yml: add oraclejdk9 build
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/46fa7b52
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/46fa7b52
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/46fa7b52
Branch: refs/heads/release
Commit: 46fa7b526721723e26c9c2d62a546b6f563af8cf
Parents: c898e48
Author: pascalschumacher <pa...@gmx.net>
Authored: Sun Oct 1 15:43:44 2017 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Sun Oct 1 15:43:44 2017 +0200
----------------------------------------------------------------------
.travis.yml | 1 +
pom.xml | 12 ++++++++++++
2 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/46fa7b52/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index be7c71f..860ae28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ sudo: false
jdk:
- openjdk7
- oraclejdk8
+ - oraclejdk9
script:
- mvn
http://git-wip-us.apache.org/repos/asf/commons-io/blob/46fa7b52/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0c1db03..d7354d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -455,5 +455,17 @@ file comparators, endian transformation classes, and much more.
</plugins>
</build>
</profile>
+ <profile>
+ <id>java9</id>
+ <activation>
+ <jdk>9</jdk>
+ </activation>
+ <properties>
+ <!-- versions below 3.0.0 do not work with java 9 -->
+ <commons.javadoc.version>3.0.0-M1</commons.javadoc.version>
+ <!-- coverall version 4.3.0 does not work with java 9, see https://github.com/trautonen/coveralls-maven-plugin/issues/112 -->
+ <coveralls.skip>true</coveralls.skip>
+ </properties>
+ </profile>
</profiles>
</project>