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 b9e63f84afb8d9449c3d6c8364b62f10a1cffb3a Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Sun Nov 15 11:19:40 2026 +0100 Respect threads set in .mvn/maven.config Fixes #813 (cherry picked from commit 32a236ccbefa315a346f35a2647ab14b24ad7ab5) --- .../java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java | 4 +--- .../java/org/mvndaemon/mvnd/client/ClientArgumentsTest.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 3 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 d9c7e88b..8e820b13 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 @@ -348,10 +348,8 @@ public class DefaultClient implements Client { args.add("-D" + Environment.MVND_RAW_STREAMS.getProperty()); } - Optional<String> threads = Optional.ofNullable(Environment.MVND_THREADS.removeCommandLineOption(args)); - Environment.MVND_THREADS.addCommandLineOption(args, threads.orElseGet(parameters::threads)); - List<String> mavenConfig = DaemonParameters.readMavenConfig(parameters.mavenConfigPath()); + ClientArguments.addDefaultOption(Environment.MVND_THREADS, args, mavenConfig, parameters::threads); ClientArguments.addDefaultOption(Environment.MVND_BUILDER, args, mavenConfig, parameters::builder); Optional<String> settings = Optional.ofNullable(Environment.MAVEN_SETTINGS.removeCommandLineOption(args)) 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 619008a4..92f6111c 100644 --- a/client/src/test/java/org/mvndaemon/mvnd/client/ClientArgumentsTest.java +++ b/client/src/test/java/org/mvndaemon/mvnd/client/ClientArgumentsTest.java @@ -62,6 +62,19 @@ public class ClientArgumentsTest { assertEquals(Arrays.asList("clean", "-b", "smart"), args); } + @Test + void threadsFromMavenConfigAreNotOverridden() { + List<String> args = new ArrayList<>(Arrays.asList("clean")); + ClientArguments.addDefaultOption(Environment.MVND_THREADS, args, Arrays.asList("-T4"), () -> "7"); + assertEquals(Arrays.asList("clean"), args); + + ClientArguments.addDefaultOption(Environment.MVND_THREADS, args, Arrays.asList("--threads=1C"), () -> "7"); + assertEquals(Arrays.asList("clean"), args); + + ClientArguments.addDefaultOption(Environment.MVND_THREADS, args, Arrays.asList(), () -> "7"); + assertEquals(Arrays.asList("clean", "-T", "7"), args); + } + @Test void readsMavenConfig(@TempDir Path dir) throws Exception { Path config = dir.resolve("maven.config");
