Tidy up and return kinda unrelated change

Author: cstamas

impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MavenInvokerTest.java

@@ -21,7 +21,6 @@
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -64,7 +63,7 @@ void defaultFs(
             @TempDir(cleanup = CleanupMode.ON_SUCCESS) Path cwd,
             @TempDir(cleanup = CleanupMode.ON_SUCCESS) Path userHome)
             throws Exception {
-        invoke(cwd, userHome, Arrays.asList("clean", "verify"));
+        invoke(cwd, userHome, List.of("verify"));
     }
 
     @Test
@@ -93,7 +92,7 @@ void conflictingExtensions(
         Path userExtensions = userConf.resolve("extensions.xml");
         Files.writeString(userExtensions, extensionsXml);
 
-        assertThrows(InvokerException.class, () -> invoke(cwd, userHome, Arrays.asList("clean", "verify")));
+        assertThrows(InvokerException.class, () -> invoke(cwd, userHome, List.of("verify")));
     }
 
     @Test
@@ -162,7 +161,7 @@ void conflictingSettings(
     @Test
     void jimFs() throws Exception {
         try (FileSystem fs = Jimfs.newFileSystem(Configuration.unix())) {
-            invoke(fs.getPath("/cwd"), fs.getPath("/home"), Arrays.asList("clean", "verify"));
+            invoke(fs.getPath("/cwd"), fs.getPath("/home"), List.of("verify"));
         }
     }
 }

impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/resident/ResidentMavenInvokerTest.java

@@ -20,7 +20,7 @@
 
 import java.nio.file.FileSystem;
 import java.nio.file.Path;
-import java.util.Arrays;
+import java.util.List;
 
 import com.google.common.jimfs.Configuration;
 import com.google.common.jimfs.Jimfs;
@@ -59,14 +59,14 @@ void defaultFs(
             @TempDir(cleanup = CleanupMode.ON_SUCCESS) Path cwd,
             @TempDir(cleanup = CleanupMode.ON_SUCCESS) Path userHome)
             throws Exception {
-        invoke(cwd, userHome, Arrays.asList("clean", "verify"));
+        invoke(cwd, userHome, List.of("verify"));
     }
 
     @Disabled("Until we move off fully from File")
     @Test
     void jimFs() throws Exception {
         try (FileSystem fs = Jimfs.newFileSystem(Configuration.unix())) {
-            invoke(fs.getPath("/cwd"), fs.getPath("/home"), Arrays.asList("clean", "verify"));
+            invoke(fs.getPath("/cwd"), fs.getPath("/home"), List.of("verify"));
         }
     }
 }

impl/maven-executor/src/main/java/org/apache/maven/cling/executor/embedded/EmbeddedMavenExecutor.java

@@ -116,6 +116,9 @@ public int hashCode() {
     protected final boolean cacheContexts;
     protected final boolean useMavenArgsEnv;
     protected final AtomicBoolean closed;
+    protected final InputStream originalStdin;
+    protected final PrintStream originalStdout;
+    protected final PrintStream originalStderr;
     protected final Properties originalProperties;
     protected final ClassLoader originalClassLoader;
     protected final ConcurrentHashMap<Key, Context> contexts;
@@ -128,6 +131,9 @@ public EmbeddedMavenExecutor(boolean cacheContexts, boolean useMavenArgsEnv) {
         this.cacheContexts = cacheContexts;
         this.useMavenArgsEnv = useMavenArgsEnv;
         this.closed = new AtomicBoolean(false);
+        this.originalStdin = System.in;
+        this.originalStdout = System.out;
+        this.originalStderr = System.err;
         this.originalClassLoader = Thread.currentThread().getContextClassLoader();
         this.contexts = new ConcurrentHashMap<>();
         this.originalProperties = new Properties();
@@ -152,6 +158,9 @@ public int execute(ExecutorRequest executorRequest) throws ExecutorException {
             try {
                 disposeRuntimeCreatedRealms(context);
             } finally {
+                System.setIn(originalStdin);
+                System.setOut(originalStdout);
+                System.setErr(originalStderr);
                 Thread.currentThread().setContextClassLoader(originalClassLoader);
                 System.setProperties(originalProperties);
                 if (!cacheContexts) {