[MNG-7698] Allow comments in .mvn/maven.config

Backport of apache#1134 --- https://issues.apache.org/jira/browse/MNG-7698
cstamas · Jun 2, 2023 · b36d634 · b36d634
1 parent 23a3a91
commit b36d634
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -382,7 +382,8 @@ void cli(CliRequest cliRequest) throws Exception {
 
             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
@@ -1,3 +1,4 @@
+# a comment
 -T
 3
 -Drevision=1.3.0