Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-7698] Support comments in maven.config (#1134)

This commit is contained in:
Guillaume Nodet 2023-06-04 07:10:57 +02:00 committed by GitHub
parent 84e133df7c
commit c124554316
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
View File

@ -388,7 +388,8 @@ public class MavenCli {
if (configFile.isFile()) { if (configFile.isFile()) {
try (Stream<String> lines = Files.lines(configFile.toPath(), Charset.defaultCharset())) { 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); mavenConfig = cliManager.parse(args);
List<?> unrecognized = mavenConfig.getArgList(); List<?> unrecognized = mavenConfig.getArgList();
if (!unrecognized.isEmpty()) { if (!unrecognized.isEmpty()) {

1
maven-embedder/src/test/projects/mavenConfigProperties/.mvn/maven.config
View File

@ -1,3 +1,4 @@
# a comment
-T -T
3 3
-Drevision=1.3.0 -Drevision=1.3.0