From 17e815f862895c968d6f156e217ca05368851620 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Tue, 20 Feb 2024 11:44:01 +0100 Subject: [PATCH 1/2] Maven DaemonCLI for 3 and 4 were not aligned As comments are supported for both 3 and 4 but mvnd did not support them in 3. --- .../src/main/java/org/apache/maven/cli/DaemonMavenCli.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java index 53301faa3..394160b8a 100644 --- a/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java +++ b/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java @@ -272,7 +272,7 @@ void cli(CliRequest cliRequest) throws Exception { if (configFile.isFile()) { try (Stream 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()) { From 45523827bb08cf16edf9ffb0287db2dea0f28acd Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Tue, 20 Feb 2024 11:51:43 +0100 Subject: [PATCH 2/2] Reformat --- .../src/main/java/org/apache/maven/cli/DaemonMavenCli.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java index 394160b8a..0ab193323 100644 --- a/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java +++ b/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java @@ -272,7 +272,8 @@ void cli(CliRequest cliRequest) throws Exception { if (configFile.isFile()) { try (Stream lines = Files.lines(configFile.toPath(), Charset.defaultCharset())) { - String[] args = lines.filter(arg -> !arg.isEmpty() && !arg.startsWith("#")).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()) {