This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch mvnd-1.x in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit 8813a3ba095b615ead34376071653dd9ec8da79d Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Sun Nov 15 11:19:40 2026 +0100 Respect a builder set in .mvn/maven.config Fixes #1439 (cherry picked from commit cdb33bc4d9d94321e0695f803dacf3641eda08af) --- .../org/mvndaemon/mvnd/client/DefaultClient.java | 4 +-- .../org/mvndaemon/mvnd/client/ClientArguments.java | 17 +++++++++++ .../mvndaemon/mvnd/client/DaemonParameters.java | 25 ++++++++++++++++ .../mvndaemon/mvnd/client/ClientArgumentsTest.java | 35 ++++++++++++++++++++++ 4 files changed, 79 insertions(+), 2 deletions(-) diff --git a/client/src/main/java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java b/client/src/main/java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java index 1b5636d8..d9c7e88b 100644 --- a/client/src/main/java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java +++ b/client/src/main/java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java @@ -351,8 +351,8 @@ public class DefaultClient implements Client { Optional<String> threads = Optional.ofNullable(Environment.MVND_THREADS.removeCommandLineOption(args)); Environment.MVND_THREADS.addCommandLineOption(args, threads.orElseGet(parameters::threads)); - Optional<String> builder = Optional.ofNullable(Environment.MVND_BUILDER.removeCommandLineOption(args)); - Environment.MVND_BUILDER.addCommandLineOption(args, builder.orElseGet(parameters::builder)); + List<String> mavenConfig = DaemonParameters.readMavenConfig(parameters.mavenConfigPath()); + ClientArguments.addDefaultOption(Environment.MVND_BUILDER, args, mavenConfig, parameters::builder); Optional<String> settings = Optional.ofNullable(Environment.MAVEN_SETTINGS.removeCommandLineOption(args)) .or(() -> Optional.ofNullable(parameters.settings()).map(Path::toString)); diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/ClientArguments.java b/client/src/main/java/org/mvndaemon/mvnd/client/ClientArguments.java index 25d38676..2ce0d5a3 100644 --- a/client/src/main/java/org/mvndaemon/mvnd/client/ClientArguments.java +++ b/client/src/main/java/org/mvndaemon/mvnd/client/ClientArguments.java @@ -19,6 +19,9 @@ package org.mvndaemon.mvnd.client; import java.util.List; +import java.util.function.Supplier; + +import org.mvndaemon.mvnd.common.Environment; /** * Adjustments the client makes to the command line before it is sent to the daemon. @@ -35,4 +38,18 @@ final class ClientArguments { static void removeBlankArguments(List<String> args) { args.removeIf(arg -> arg.trim().isEmpty()); } + + /** + * Passes {@code env} to the daemon. A value given on the command line is kept, one given in + * {@code .mvn/maven.config} is left for Maven to read, and only otherwise is the default added. + */ + static void addDefaultOption( + Environment env, List<String> args, List<String> mavenConfig, Supplier<String> defaultValue) { + String value = env.removeCommandLineOption(args); + if (value != null) { + env.addCommandLineOption(args, value); + } else if (!env.hasCommandLineOption(mavenConfig)) { + env.addCommandLineOption(args, defaultValue.get()); + } + } } diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java index 7e23e4ef..19b26004 100644 --- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java +++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java @@ -21,6 +21,7 @@ package org.mvndaemon.mvnd.client; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -219,6 +220,30 @@ public class DaemonParameters { return multiModuleProjectDirectory().resolve(".mvn/jvm.config"); } + /** + * The <code>.mvn/maven.config</code> file, whose arguments Maven prepends to the command line. + */ + public Path mavenConfigPath() { + return multiModuleProjectDirectory().resolve(".mvn/maven.config"); + } + + /** + * Reads the arguments the way the daemon does: one per line, skipping empty lines and comments. + * + * @return the arguments found in {@code mavenConfig}, or an empty list if it does not exist + */ + static List<String> readMavenConfig(Path mavenConfig) { + if (!Files.isRegularFile(mavenConfig)) { + return Collections.emptyList(); + } + try (Stream<String> lines = Files.lines(mavenConfig, Charset.defaultCharset())) { + return lines.filter(line -> !line.isEmpty() && !line.startsWith("#")) + .collect(Collectors.toList()); + } catch (IOException e) { + throw new RuntimeException("Could not read " + mavenConfig, e); + } + } + public Path localPropertiesPath() { return multiModuleProjectDirectory().resolve(".mvn/mvnd.properties"); } diff --git a/client/src/test/java/org/mvndaemon/mvnd/client/ClientArgumentsTest.java b/client/src/test/java/org/mvndaemon/mvnd/client/ClientArgumentsTest.java index e7c5626b..619008a4 100644 --- a/client/src/test/java/org/mvndaemon/mvnd/client/ClientArgumentsTest.java +++ b/client/src/test/java/org/mvndaemon/mvnd/client/ClientArgumentsTest.java @@ -18,11 +18,15 @@ */ package org.mvndaemon.mvnd.client; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import org.mvndaemon.mvnd.common.Environment; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -34,4 +38,35 @@ public class ClientArgumentsTest { ClientArguments.removeBlankArguments(args); assertEquals(Arrays.asList("clean", "install"), args); } + + @Test + void builderFromMavenConfigIsNotOverridden() { + List<String> args = new ArrayList<>(Arrays.asList("clean")); + ClientArguments.addDefaultOption(Environment.MVND_BUILDER, args, Arrays.asList("-b", "turbo"), () -> "smart"); + assertEquals(Arrays.asList("clean"), args); + ClientArguments.addDefaultOption(Environment.MVND_BUILDER, args, Arrays.asList("-bturbo"), () -> "smart"); + assertEquals(Arrays.asList("clean"), args); + } + + @Test + void builderFromCommandLineWinsOverDefault() { + List<String> args = new ArrayList<>(Arrays.asList("--builder=turbo", "clean")); + ClientArguments.addDefaultOption(Environment.MVND_BUILDER, args, Arrays.asList(), () -> "smart"); + assertEquals(Arrays.asList("clean", "-b", "turbo"), args); + } + + @Test + void defaultBuilderIsAddedOtherwise() { + List<String> args = new ArrayList<>(Arrays.asList("clean")); + ClientArguments.addDefaultOption(Environment.MVND_BUILDER, args, Arrays.asList("-T4"), () -> "smart"); + assertEquals(Arrays.asList("clean", "-b", "smart"), args); + } + + @Test + void readsMavenConfig(@TempDir Path dir) throws Exception { + Path config = dir.resolve("maven.config"); + Files.write(config, Arrays.asList("-bturbo", "", "# a comment", "-T4", "-Dfoo=bar")); + assertEquals(Arrays.asList("-bturbo", "-T4", "-Dfoo=bar"), DaemonParameters.readMavenConfig(config)); + assertEquals(Arrays.asList(), DaemonParameters.readMavenConfig(dir.resolve("missing"))); + } }
