This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-3.9.x by this push:
new 3c29fa5e7 [MNG-7698] Allow comments in .mvn/maven.config (#1141)
3c29fa5e7 is described below
commit 3c29fa5e7428fc7b077560c28138df244ac5213e
Author: Tamas Cservenak <[email protected]>
AuthorDate: Sun Jun 4 07:11:11 2023 +0200
[MNG-7698] Allow comments in .mvn/maven.config (#1141)
Backport of https://github.com/apache/maven/pull/1134
---
https://issues.apache.org/jira/browse/MNG-7698
---
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 11053828a..5932741a5 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
@@ -382,7 +382,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
