Use cached default charset and update URL fragment (#360)

apache · Feb 23, 2025 · 39a28af · 39a28af
1 parent 995d8cf
commit 39a28af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...rules/src/main/java/org/apache/maven/enforcer/rules/checksum/RequireTextFileChecksum.java b/...rules/src/main/java/org/apache/maven/enforcer/rules/checksum/RequireTextFileChecksum.java
@@ -74,11 +74,13 @@ public void execute() throws EnforcerRuleException {
             // https://maven.apache.org/plugins/maven-resources-plugin/examples/encoding.html
             String projectEncoding = project.getProperties().getProperty("project.build.sourceEncoding", null);
             if (StringUtils.isBlank(projectEncoding)) {
-                projectEncoding = System.getProperty("file.encoding");
-                getLog().warn("File encoding has not been set, using platform encoding " + projectEncoding
-                        + ". Build is platform dependent! - https://maven.apache.org/general.html#encoding-warning");
+                encoding = Charset.defaultCharset();
+                getLog().warn(
+                                "File encoding has not been set, using platform encoding " + encoding.displayName()
+                                        + ". Build is platform dependent! - https://maven.apache.org/general.html#How_do_I_prevent_.E2.80.9C.5BWARNING.5D_Using_platform_encoding_.28Cp1252_actually.29_to_copy_filtered_resources.2C_i.e._build_is_platform_dependent.21.E2.80.9D");
+            } else {
+                encoding = Charset.forName(projectEncoding);
             }
-            encoding = Charset.forName(projectEncoding);
         }
         super.execute();
     }

diff --git a/...s/src/test/java/org/apache/maven/enforcer/rules/checksum/TestRequireTextFileChecksum.java b/...s/src/test/java/org/apache/maven/enforcer/rules/checksum/TestRequireTextFileChecksum.java
@@ -132,7 +132,7 @@ void testFileChecksumMd5NormalizedWithMissingFileCharsetParameter() throws IOExc
         rule.setNormalizeLineSeparatorTo(LineSeparator.UNIX);
 
         rule.execute();
-        // name is not unique therefore compare generated charset
-        Assertions.assertEquals(Charset.forName(System.getProperty("file.encoding")), rule.getEncoding());
+        // Name is not unique. Therefore compare generated charset.
+        Assertions.assertEquals(Charset.defaultCharset(), rule.getEncoding());
     }
 }