Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-…

…collections.git
apache · Dec 11, 2023 · ae72194 · ae72194
2 parents 36b23c5 + 0913090
commit ae72194
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>64</version>
+    <version>65</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>commons-collections4</artifactId>

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -296,7 +296,7 @@
       Bump codecov/codecov-action from 2 to 3 #297.
     </action>
     <action dev="ggregory" type="update" due-to="Gary Gregory, Dependabot">
-      Bump Apache commons-parent from 48 to 64, #339.
+      Bump Apache commons-parent from 48 to 65, #339, #435.
     </action>
     <action dev="ggregory" type="update" due-to="Gary Gregory">
       Bump Jacoco from 0.8.4 to 0.8.8.

diff --git a/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
@@ -35,7 +35,7 @@
 import org.junit.jupiter.api.Test;
 
 /**
- * Abstract test class for {@link java.lang.Object} methods and contracts.
+ * Abstract test class for {@link Object} methods and contracts.
  * <p>
  * To use, simply extend this class, and implement
  * the {@link #makeObject()} method.

diff --git a/src/test/java/org/apache/commons/collections4/properties/EmptyPropertiesTest.java b/src/test/java/org/apache/commons/collections4/properties/EmptyPropertiesTest.java
@@ -289,8 +289,8 @@ public void testSave() throws IOException {
             PropertiesFactory.INSTANCE.createProperties().store(expected, comments);
 
             // Properties.store stores the specified comment appended with current time stamp in the next line
-            final String expectedComment = getFirstLine(expected.toString("UTF-8"));
-            final String actualComment = getFirstLine(actual.toString("UTF-8"));
+            final String expectedComment = getFirstLine(expected.toString(StandardCharsets.UTF_8.name()));
+            final String actualComment = getFirstLine(actual.toString(StandardCharsets.UTF_8.name()));
             assertEquals(expectedComment, actualComment,
                 () -> String.format("Expected String '%s' with length '%s'", expectedComment, expectedComment.length()));
             expected.reset();