You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2025/10/30 11:48:04 UTC

(commons-io) branch master updated (8b290be60 -> e81bb0a29)

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git


    from 8b290be60 Merge branch 'master' of https://github.com/apache/commons-io.git
     new f11570f1b Use new Oak leaf logotype
     new e81bb0a29 Bump org.apache.commons:commons-parent from 90 to 91

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                            |   2 +-
 src/changes/changes.xml                            |   2 +-
 .../java/org/apache/commons/io/doc-files/logo.png  | Bin 0 -> 9233 bytes
 src/main/javadoc/overview.html                     |   1 +
 src/media/commons-logo-component-100.xcf           | Bin 0 -> 30258 bytes
 src/media/commons-logo-component.xcf               | Bin 0 -> 146691 bytes
 src/media/logo-large.xcf                           | Bin 138018 -> 0 bytes
 src/media/logo.png                                 | Bin 9536 -> 9233 bytes
 src/media/logo.xcf                                 | Bin 21258 -> 0 bytes
 src/site/resources/images/logo.png                 | Bin 9536 -> 9233 bytes
 .../java/org/apache/commons/io/FileUtilsTest.java  |   6 +++---
 .../java/org/apache/commons/io/IOUtilsTest.java    |  24 ++++++++++-----------
 ...UtilsTestDataCR.dat => FileUtilsTestDataCR.bin} | Bin
 ...sTestDataCRLF.dat => FileUtilsTestDataCRLF.bin} | Bin
 ...UtilsTestDataLF.dat => FileUtilsTestDataLF.bin} | Bin
 15 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 src/main/java/org/apache/commons/io/doc-files/logo.png
 create mode 100644 src/media/commons-logo-component-100.xcf
 create mode 100644 src/media/commons-logo-component.xcf
 delete mode 100644 src/media/logo-large.xcf
 delete mode 100644 src/media/logo.xcf
 rename src/test/resources/org/apache/commons/io/{FileUtilsTestDataCR.dat => FileUtilsTestDataCR.bin} (100%)
 rename src/test/resources/org/apache/commons/io/{FileUtilsTestDataCRLF.dat => FileUtilsTestDataCRLF.bin} (100%)
 rename src/test/resources/org/apache/commons/io/{FileUtilsTestDataLF.dat => FileUtilsTestDataLF.bin} (100%)


(commons-io) 01/02: Use new Oak leaf logotype

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git

commit f11570f1b1373ba2cf25845e45ffaf5a88be5eda
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Thu Oct 30 07:47:51 2025 -0400

    Use new Oak leaf logotype
---
 .../java/org/apache/commons/io/doc-files/logo.png     | Bin 0 -> 9233 bytes
 src/main/javadoc/overview.html                        |   1 +
 src/media/commons-logo-component-100.xcf              | Bin 0 -> 30258 bytes
 src/media/commons-logo-component.xcf                  | Bin 0 -> 146691 bytes
 src/media/logo-large.xcf                              | Bin 138018 -> 0 bytes
 src/media/logo.png                                    | Bin 9536 -> 9233 bytes
 src/media/logo.xcf                                    | Bin 21258 -> 0 bytes
 src/site/resources/images/logo.png                    | Bin 9536 -> 9233 bytes
 ...ileUtilsTestDataCR.dat => FileUtilsTestDataCR.bin} | Bin
 ...tilsTestDataCRLF.dat => FileUtilsTestDataCRLF.bin} | Bin
 ...ileUtilsTestDataLF.dat => FileUtilsTestDataLF.bin} | Bin
 11 files changed, 1 insertion(+)

diff --git a/src/main/java/org/apache/commons/io/doc-files/logo.png b/src/main/java/org/apache/commons/io/doc-files/logo.png
new file mode 100644
index 000000000..02a758f0e
Binary files /dev/null and b/src/main/java/org/apache/commons/io/doc-files/logo.png differ
diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
index d9ac38e07..0ffd28dac 100644
--- a/src/main/javadoc/overview.html
+++ b/src/main/javadoc/overview.html
@@ -17,6 +17,7 @@
 -->
 <html>
 <body>
+<img alt="Apache Commons IO" src="org/apache/commons/io/doc-files/logo.png">
 <h1>Apache Commons IO</h1>
 <h2>Introduction</h2>
 <p>
diff --git a/src/media/commons-logo-component-100.xcf b/src/media/commons-logo-component-100.xcf
new file mode 100644
index 000000000..d767311a1
Binary files /dev/null and b/src/media/commons-logo-component-100.xcf differ
diff --git a/src/media/commons-logo-component.xcf b/src/media/commons-logo-component.xcf
new file mode 100644
index 000000000..a7dcdd43c
Binary files /dev/null and b/src/media/commons-logo-component.xcf differ
diff --git a/src/media/logo-large.xcf b/src/media/logo-large.xcf
deleted file mode 100644
index caa37f4d0..000000000
Binary files a/src/media/logo-large.xcf and /dev/null differ
diff --git a/src/media/logo.png b/src/media/logo.png
index 396ba49f8..02a758f0e 100644
Binary files a/src/media/logo.png and b/src/media/logo.png differ
diff --git a/src/media/logo.xcf b/src/media/logo.xcf
deleted file mode 100644
index 72619d28c..000000000
Binary files a/src/media/logo.xcf and /dev/null differ
diff --git a/src/site/resources/images/logo.png b/src/site/resources/images/logo.png
index 396ba49f8..02a758f0e 100644
Binary files a/src/site/resources/images/logo.png and b/src/site/resources/images/logo.png differ
diff --git a/src/test/resources/org/apache/commons/io/FileUtilsTestDataCR.dat b/src/test/resources/org/apache/commons/io/FileUtilsTestDataCR.bin
similarity index 100%
rename from src/test/resources/org/apache/commons/io/FileUtilsTestDataCR.dat
rename to src/test/resources/org/apache/commons/io/FileUtilsTestDataCR.bin
diff --git a/src/test/resources/org/apache/commons/io/FileUtilsTestDataCRLF.dat b/src/test/resources/org/apache/commons/io/FileUtilsTestDataCRLF.bin
similarity index 100%
rename from src/test/resources/org/apache/commons/io/FileUtilsTestDataCRLF.dat
rename to src/test/resources/org/apache/commons/io/FileUtilsTestDataCRLF.bin
diff --git a/src/test/resources/org/apache/commons/io/FileUtilsTestDataLF.dat b/src/test/resources/org/apache/commons/io/FileUtilsTestDataLF.bin
similarity index 100%
rename from src/test/resources/org/apache/commons/io/FileUtilsTestDataLF.dat
rename to src/test/resources/org/apache/commons/io/FileUtilsTestDataLF.bin


(commons-io) 02/02: Bump org.apache.commons:commons-parent from 90 to 91

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git

commit e81bb0a29a1fec17e5a628c8f0ac3ca767b0f0f3
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Thu Oct 30 07:47:58 2025 -0400

    Bump org.apache.commons:commons-parent from 90 to 91
---
 pom.xml                                            |  2 +-
 src/changes/changes.xml                            |  2 +-
 .../java/org/apache/commons/io/FileUtilsTest.java  |  6 +++---
 .../java/org/apache/commons/io/IOUtilsTest.java    | 24 +++++++++++-----------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index d3c5e2134..f60efbc76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>90</version>
+    <version>91</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>commons-io</groupId>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index cd5a9d8f8..07bb304a5 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -74,7 +74,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="pkarwasz" type="add"                due-to="Piotr P. Karwasz">Add CloseShieldChannel to close-shielded NIO Channels #786.</action>
       <action dev="pkarwasz" type="add"                due-to="Piotr P. Karwasz">Added IOUtils.checkFromIndexSize as a Java 8 backport of Objects.checkFromIndexSize #790.</action>
       <!-- UPDATE -->
-      <action type="update" dev="ggregory"             due-to="Gary Gregory, Dependabot">Bump org.apache.commons:commons-parent from 85 to 90 #774, #783, #808.</action>
+      <action type="update" dev="ggregory"             due-to="Gary Gregory, Dependabot">Bump org.apache.commons:commons-parent from 85 to 91 #774, #783, #808.</action>
       <action type="update" dev="ggregory"             due-to="Gary Gregory">[test] Bump commons-codec:commons-codec from 1.18.0 to 1.19.0.</action>
       <action type="update" dev="ggregory"             due-to="Gary Gregory, Dependabot">[test] Bump commons.bytebuddy.version from 1.17.6 to 1.17.8 #769.</action>
       <action type="update" dev="ggregory"             due-to="Gary Gregory">[test] Bump org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0.</action>
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTest.java b/src/test/java/org/apache/commons/io/FileUtilsTest.java
index e45baaf42..91d351efe 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTest.java
@@ -666,17 +666,17 @@ void testContentEqualsIgnoreEOL() throws Exception {
         assertFalse(FileUtils.contentEqualsIgnoreEOL(tfile1, tfile3, null));
         assertFalse(FileUtils.contentEqualsIgnoreEOL(tfile2, tfile3, null));
 
-        final URL urlCR = getClass().getResource("FileUtilsTestDataCR.dat");
+        final URL urlCR = getClass().getResource("FileUtilsTestDataCR.bin");
         assertNotNull(urlCR);
         final File cr = new File(urlCR.toURI());
         assertTrue(cr.exists());
 
-        final URL urlCRLF = getClass().getResource("FileUtilsTestDataCRLF.dat");
+        final URL urlCRLF = getClass().getResource("FileUtilsTestDataCRLF.bin");
         assertNotNull(urlCRLF);
         final File crlf = new File(urlCRLF.toURI());
         assertTrue(crlf.exists());
 
-        final URL urlLF = getClass().getResource("FileUtilsTestDataLF.dat");
+        final URL urlLF = getClass().getResource("FileUtilsTestDataLF.bin");
         assertNotNull(urlLF);
         final File lf = new File(urlLF.toURI());
         assertTrue(lf.exists());
diff --git a/src/test/java/org/apache/commons/io/IOUtilsTest.java b/src/test/java/org/apache/commons/io/IOUtilsTest.java
index 7632b316c..033fdffdd 100644
--- a/src/test/java/org/apache/commons/io/IOUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/IOUtilsTest.java
@@ -1375,16 +1375,16 @@ void testResourceToByteArray_ExistingResourceAtRootPackage_WithClassLoader() thr
 
     @Test
     void testResourceToByteArray_ExistingResourceAtSubPackage() throws Exception {
-        final long fileSize = TestResources.getFile("FileUtilsTestDataCR.dat").length();
-        final byte[] bytes = IOUtils.resourceToByteArray("/org/apache/commons/io/FileUtilsTestDataCR.dat");
+        final long fileSize = TestResources.getFile("FileUtilsTestDataCR.bin").length();
+        final byte[] bytes = IOUtils.resourceToByteArray("/org/apache/commons/io/FileUtilsTestDataCR.bin");
         assertNotNull(bytes);
         assertEquals(fileSize, bytes.length);
     }
 
     @Test
     void testResourceToByteArray_ExistingResourceAtSubPackage_WithClassLoader() throws Exception {
-        final long fileSize = TestResources.getFile("FileUtilsTestDataCR.dat").length();
-        final byte[] bytes = IOUtils.resourceToByteArray("org/apache/commons/io/FileUtilsTestDataCR.dat",
+        final long fileSize = TestResources.getFile("FileUtilsTestDataCR.bin").length();
+        final byte[] bytes = IOUtils.resourceToByteArray("org/apache/commons/io/FileUtilsTestDataCR.bin",
             ClassLoader.getSystemClassLoader());
         assertNotNull(bytes);
         assertEquals(fileSize, bytes.length);
@@ -1436,8 +1436,8 @@ void testResourceToString_ExistingResourceAtRootPackage_WithClassLoader() throws
 
     @Test
     void testResourceToString_ExistingResourceAtSubPackage() throws Exception {
-        final long fileSize = TestResources.getFile("FileUtilsTestDataCR.dat").length();
-        final String content = IOUtils.resourceToString("/org/apache/commons/io/FileUtilsTestDataCR.dat",
+        final long fileSize = TestResources.getFile("FileUtilsTestDataCR.bin").length();
+        final String content = IOUtils.resourceToString("/org/apache/commons/io/FileUtilsTestDataCR.bin",
             StandardCharsets.UTF_8);
 
         assertNotNull(content);
@@ -1446,8 +1446,8 @@ void testResourceToString_ExistingResourceAtSubPackage() throws Exception {
 
     @Test
     void testResourceToString_ExistingResourceAtSubPackage_WithClassLoader() throws Exception {
-        final long fileSize = TestResources.getFile("FileUtilsTestDataCR.dat").length();
-        final String content = IOUtils.resourceToString("org/apache/commons/io/FileUtilsTestDataCR.dat",
+        final long fileSize = TestResources.getFile("FileUtilsTestDataCR.bin").length();
+        final String content = IOUtils.resourceToString("org/apache/commons/io/FileUtilsTestDataCR.bin",
             StandardCharsets.UTF_8, ClassLoader.getSystemClassLoader());
 
         assertNotNull(content);
@@ -1506,18 +1506,18 @@ void testResourceToURL_ExistingResourceAtRootPackage_WithClassLoader() throws Ex
 
     @Test
     void testResourceToURL_ExistingResourceAtSubPackage() throws Exception {
-        final URL url = IOUtils.resourceToURL("/org/apache/commons/io/FileUtilsTestDataCR.dat");
+        final URL url = IOUtils.resourceToURL("/org/apache/commons/io/FileUtilsTestDataCR.bin");
         assertNotNull(url);
-        assertTrue(url.getFile().endsWith("/org/apache/commons/io/FileUtilsTestDataCR.dat"));
+        assertTrue(url.getFile().endsWith("/org/apache/commons/io/FileUtilsTestDataCR.bin"));
     }
 
     @Test
     void testResourceToURL_ExistingResourceAtSubPackage_WithClassLoader() throws Exception {
-        final URL url = IOUtils.resourceToURL("org/apache/commons/io/FileUtilsTestDataCR.dat",
+        final URL url = IOUtils.resourceToURL("org/apache/commons/io/FileUtilsTestDataCR.bin",
             ClassLoader.getSystemClassLoader());
 
         assertNotNull(url);
-        assertTrue(url.getFile().endsWith("/org/apache/commons/io/FileUtilsTestDataCR.dat"));
+        assertTrue(url.getFile().endsWith("/org/apache/commons/io/FileUtilsTestDataCR.bin"));
     }
 
     @Test