This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch bug2 in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit 74e44edd4fd13d173e0c575946bc3cabc832ec24 Author: Elliotte Rusty Harold <elh...@ibiblio.org> AuthorDate: Sun Feb 23 09:40:13 2025 -0500 Use cached default charset and update URL fragment --- .../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()); } }