[maven] branch master updated: [MNG-7698] Support comments in maven.config (#1134)

[gnodet]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new c12455431 [MNG-7698] Support comments in maven.config (#1134)
c12455431 is described below

commit c124554316a1a89f03a81ecc1df38c10ba3fb972
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Sun Jun 4 07:10:57 2023 +0200

    [MNG-7698] Support comments in maven.config (#1134)
---
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java        | 3 ++-
 .../src/test/projects/mavenConfigProperties/.mvn/maven.config          | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 5a0c1d15c..b3f29d57c 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -388,7 +388,8 @@ public class MavenCli {
 
             if (configFile.isFile()) {
                 try (Stream<String> lines = Files.lines(configFile.toPath(), 
Charset.defaultCharset())) {
-                    String[] args = lines.filter(arg -> 
!arg.isEmpty()).toArray(String[]::new);
+                    String[] args = lines.filter(arg -> !arg.isEmpty() && 
!arg.startsWith("#"))
+                            .toArray(String[]::new);
                     mavenConfig = cliManager.parse(args);
                     List<?> unrecognized = mavenConfig.getArgList();
                     if (!unrecognized.isEmpty()) {
diff --git 
a/maven-embedder/src/test/projects/mavenConfigProperties/.mvn/maven.config 
b/maven-embedder/src/test/projects/mavenConfigProperties/.mvn/maven.config
index 82570230f..7f7a68702 100644
--- a/maven-embedder/src/test/projects/mavenConfigProperties/.mvn/maven.config
+++ b/maven-embedder/src/test/projects/mavenConfigProperties/.mvn/maven.config
@@ -1,3 +1,4 @@
+# a comment
 -T
 3
 -Drevision=1.3.0