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 2820acbdf0935385f1030e3ff3dd1ebcf5e47fc3 Author: Tamas Cservenak <[email protected]> AuthorDate: Wed Jun 18 21:31:58 2025 +0200 Fix test framework side effects (java props) (#1359) (cherry picked from commit d3c15a75b057293f60297345065839de42554a6b) Adapted: JvmTestClient merged by hand (no augmentArgs on 1.x); the MavenConfIgnoreExtNativeIT hunk is omitted, that test does not exist on 1.x. --- .../org/mvndaemon/mvnd/client/DefaultClient.java | 11 ++++++--- .../org/mvndaemon/mvnd/junit/JvmTestClient.java | 28 +++++++++++++++------- 2 files changed, 27 insertions(+), 12 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 8a7142c8..fb42d851 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 @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.EnumSet; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -178,7 +179,8 @@ public class DefaultClient implements Client { System.exit(exitCode); } - public static void setSystemPropertiesFromCommandLine(List<String> args) { + public static Map<String, String> setSystemPropertiesFromCommandLine(List<String> args) { + final HashMap<String, String> prevState = new HashMap<>(); final Iterator<String> iterator = args.iterator(); boolean defineIsEmpty = false; while (iterator.hasNext()) { @@ -205,14 +207,17 @@ public class DefaultClient implements Client { if (eqPos >= 0) { String k = val.substring(0, eqPos); String v = val.substring(eqPos + 1); - System.setProperty(k, v); + String old = System.setProperty(k, v); + prevState.put(k, old); LOGGER.trace("Setting system property {} to {}", k, v); } else { - System.setProperty(val, ""); + String old = System.setProperty(val, ""); + prevState.put(val, old); LOGGER.trace("Setting system property {}", val); } } } + return prevState; } private static boolean maybeDefineCommandLineOption(String arg) { diff --git a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/JvmTestClient.java b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/JvmTestClient.java index bf2de0fb..094c4776 100644 --- a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/JvmTestClient.java +++ b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/JvmTestClient.java @@ -58,16 +58,26 @@ public class JvmTestClient extends DefaultClient { @Override public ExecutionResult execute(ClientOutput output, List<String> argv) { setMultiModuleProjectDirectory(argv); - setSystemPropertiesFromCommandLine(argv); - argv = new ArrayList<>(argv); - if (parameters instanceof TestParameters && ((TestParameters) parameters).isNoTransferProgress()) { - argv.add("-ntp"); - } - final ExecutionResult delegate = super.execute(output, augmentArgs(argv)); - if (output instanceof TestClientOutput) { - return new JvmTestResult(delegate, ((TestClientOutput) output).messagesToString()); + Map<String, String> prevState = setSystemPropertiesFromCommandLine(argv); + try { + argv = new ArrayList<>(argv); + if (parameters instanceof TestParameters && ((TestParameters) parameters).isNoTransferProgress()) { + argv.add("-ntp"); + } + final ExecutionResult delegate = super.execute(output, augmentArgs(argv)); + if (output instanceof TestClientOutput) { + return new JvmTestResult(delegate, ((TestClientOutput) output).messagesToString()); + } + return delegate; + } finally { + prevState.forEach((key, value) -> { + if (value == null) { + System.clearProperty(key); + } else { + System.setProperty(key, value); + } + }); } - return delegate; } private void setMultiModuleProjectDirectory(List<String> args) {
