(maven-enforcer) branch master updated: Use cached default charset and update URL fragment (#360)

[elharo]

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

elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git


The following commit(s) were added to refs/heads/master by this push:
     new 39a28af  Use cached default charset and update URL fragment (#360)
39a28af is described below

commit 39a28af66b6e15e6bbc0591a54bbe334d0546da7
Author: Elliotte Rusty Harold <elh...@users.noreply.github.com>
AuthorDate: Sun Feb 23 16:54:14 2025 +0000

    Use cached default charset and update URL fragment (#360)
---
 .../maven/enforcer/rules/checksum/RequireTextFileChecksum.java | 10 ++++++----
 .../enforcer/rules/checksum/TestRequireTextFileChecksum.java   |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/checksum/RequireTextFileChecksum.java
 
b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/checksum/RequireTextFileChecksum.java
index 8454184..7484f0d 100644
--- 
a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/checksum/RequireTextFileChecksum.java
+++ 
b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/checksum/RequireTextFileChecksum.java
@@ -74,11 +74,13 @@ public final class RequireTextFileChecksum extends 
RequireFileChecksum {
             // 
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/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/checksum/TestRequireTextFileChecksum.java
 
b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/checksum/TestRequireTextFileChecksum.java
index 72ea162..46f8ea2 100644
--- 
a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/checksum/TestRequireTextFileChecksum.java
+++ 
b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/checksum/TestRequireTextFileChecksum.java
@@ -132,7 +132,7 @@ class TestRequireTextFileChecksum {
         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());
     }
 }