(maven) branch maven-4.0.x updated: Make config files use UTF8 (#11263) (#11265)

[cstamas]

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

cstamas pushed a commit to branch maven-4.0.x
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/maven-4.0.x by this push:
     new 2150209ee0 Make config files use UTF8 (#11263) (#11265)
2150209ee0 is described below

commit 2150209ee080db3d0fc661803b39086f741a08ab
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Tue Oct 14 14:40:10 2025 +0200

    Make config files use UTF8 (#11263) (#11265)
    
    Maven-Embedder uses system default encoding, making builds non portable. 
This was "inherited" by maven-cli.
    
    Now all config files are made UTF8.
    
    Fixes https://github.com/apache/maven/issues/11258
    
    Backport of 5e9d4f7c975e44ba371a002cf0e7254ceab77187
---
 .../maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 4 ++--
 .../main/java/org/apache/maven/cling/invoker/mvn/MavenParser.java   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/compat/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java 
b/compat/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 289fe9c710..2828479fad 100644
--- a/compat/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/compat/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -27,7 +27,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
@@ -384,7 +384,7 @@ void cli(CliRequest cliRequest) throws Exception {
             File configFile = new File(cliRequest.multiModuleProjectDirectory, 
MVN_MAVEN_CONFIG);
 
             if (configFile.isFile()) {
-                try (Stream<String> lines = Files.lines(configFile.toPath(), 
Charset.defaultCharset())) {
+                try (Stream<String> lines = Files.lines(configFile.toPath(), 
StandardCharsets.UTF_8)) {
                     String[] args = lines.filter(arg -> !arg.isEmpty() && 
!arg.startsWith("#"))
                             .toArray(String[]::new);
                     mavenConfig = cliManager.parse(args);
diff --git 
a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenParser.java
 
b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenParser.java
index 2b9b9bf53f..b767377fac 100644
--- 
a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenParser.java
+++ 
b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenParser.java
@@ -19,7 +19,7 @@
 package org.apache.maven.cling.invoker.mvn;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -64,7 +64,7 @@ protected MavenOptions parseMavenCliOptions(List<String> 
args) {
     }
 
     protected MavenOptions parseMavenAtFileOptions(Path atFile) {
-        try (Stream<String> lines = Files.lines(atFile, 
Charset.defaultCharset())) {
+        try (Stream<String> lines = Files.lines(atFile, 
StandardCharsets.UTF_8)) {
             List<String> args =
                     lines.filter(arg -> !arg.isEmpty() && 
!arg.startsWith("#")).toList();
             return parseArgs("atFile", args);
@@ -77,7 +77,7 @@ protected MavenOptions parseMavenAtFileOptions(Path atFile) {
     }
 
     protected MavenOptions parseMavenConfigOptions(Path configFile) {
-        try (Stream<String> lines = Files.lines(configFile, 
Charset.defaultCharset())) {
+        try (Stream<String> lines = Files.lines(configFile, 
StandardCharsets.UTF_8)) {
             List<String> args =
                     lines.filter(arg -> !arg.isEmpty() && 
!arg.startsWith("#")).toList();
             MavenOptions options = parseArgs("maven.config", args);