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 0af90cb1c2c6d82f8a960aa307e2e282a05b50f4 Author: Goutam Adwant <[email protected]> AuthorDate: Sat Aug 1 16:17:20 2026 +0200 Fix Maven fail mode option parsing (#1684) (cherry picked from commit 80f2fc1860a64bd8c114496502b98773110e23d8) Adapted: Java 8 set construction instead of Set.of; merged with the VOID-option handling already on 1.x. --- .../org/mvndaemon/mvnd/client/EnvironmentTest.java | 20 ++++++++++++++++++++ .../java/org/mvndaemon/mvnd/common/Environment.java | 20 +++++++++++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/client/src/test/java/org/mvndaemon/mvnd/client/EnvironmentTest.java b/client/src/test/java/org/mvndaemon/mvnd/client/EnvironmentTest.java index 4f3cc3d1..b3cf3a3d 100644 --- a/client/src/test/java/org/mvndaemon/mvnd/client/EnvironmentTest.java +++ b/client/src/test/java/org/mvndaemon/mvnd/client/EnvironmentTest.java @@ -67,6 +67,26 @@ public class EnvironmentTest { assertEquals("", Environment.MAVEN_DEFINE.removeCommandLineOption(list("--define"))); } + @Test + void mavenFileArguments() { + assertEquals("pom.xml", Environment.MAVEN_FILE.removeCommandLineOption(list("-f", "pom.xml"))); + assertEquals("pom.xml", Environment.MAVEN_FILE.removeCommandLineOption(list("-fpom.xml"))); + assertEquals("pom.xml", Environment.MAVEN_FILE.removeCommandLineOption(list("-f=pom.xml"))); + assertEquals("pom.xml", Environment.MAVEN_FILE.removeCommandLineOption(list("--file", "pom.xml"))); + assertEquals("pom.xml", Environment.MAVEN_FILE.removeCommandLineOption(list("--file=pom.xml"))); + } + + @Test + void mavenFailModeArgumentsAreNotMavenFileArguments() { + for (String failMode : Arrays.asList("-fae", "-ff", "-fn")) { + List<String> args = list(failMode, "verify"); + + Assertions.assertFalse(Environment.MAVEN_FILE.hasCommandLineOption(args)); + Assertions.assertNull(Environment.MAVEN_FILE.removeCommandLineOption(args)); + assertEquals(list(failMode, "verify"), args); + } + } + private List<String> list(String... items) { return new ArrayList<>(Arrays.asList(items)); } diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java b/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java index 91361dfe..371986a1 100644 --- a/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java +++ b/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java @@ -23,9 +23,11 @@ import java.io.InputStream; import java.nio.file.Path; import java.nio.file.Paths; import java.time.Duration; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Comparator; +import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Locale; @@ -329,6 +331,10 @@ public enum Environment { MVND_CANCEL_CONNECT_TIMEOUT("mvnd.cancelConnectTimeout", null, "3 seconds", OptionType.DURATION, Flags.NONE), ; + // Maven defines these as complete short options, not as "-f" with an attached value. + private static final Set<String> MAVEN_FILE_SHORT_OPTION_CONFLICTS = + Collections.unmodifiableSet(new HashSet<>(Arrays.asList("-fae", "-ff", "-fn"))); + static Properties properties; public static void setProperties(Properties properties) { @@ -492,7 +498,8 @@ public enum Environment { public boolean hasCommandLineOption(Collection<String> args) { final String[] prefixes = getPrefixes(); - return args.stream().anyMatch(arg -> Stream.of(prefixes).anyMatch(arg::startsWith)); + return args.stream() + .anyMatch(arg -> Stream.of(prefixes).anyMatch(prefix -> matchesCommandLineOption(arg, prefix))); } public String getCommandLineOption(Collection<String> args) { @@ -508,12 +515,12 @@ public enum Environment { String value = null; for (Iterator<String> it = args.iterator(); it.hasNext(); ) { String arg = it.next(); - if (Stream.of(prefixes).anyMatch(arg::startsWith)) { + if (Stream.of(prefixes).anyMatch(prefix -> matchesCommandLineOption(arg, prefix))) { if (remove) { it.remove(); } String opt = Stream.of(prefixes) - .filter(arg::startsWith) + .filter(prefix -> matchesCommandLineOption(arg, prefix)) .max(Comparator.comparing(String::length)) .get(); if (type == OptionType.VOID) { @@ -543,6 +550,13 @@ public enum Environment { return value; } + private boolean matchesCommandLineOption(String arg, String prefix) { + if (this == MAVEN_FILE && MAVEN_FILE_SHORT_OPTION_CONFLICTS.contains(arg)) { + return false; + } + return arg.startsWith(prefix); + } + private String[] getPrefixes() { final String[] prefixes; if (options.isEmpty()) {
