Add support for environment variables into ProcessRunner so that MavenRunner's support for remote debug works again.

Author: nedtwigg

lib/src/main/java/com/diffplug/spotless/ProcessRunner.java

@@ -24,6 +24,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -57,18 +58,18 @@ public Result shell(String cmd) throws IOException, InterruptedException {
 
 	/** Executes the given shell command (using {@code cmd} on windows and {@code sh} on unix). */
 	public Result shellWinUnix(String cmdWin, String cmdUnix) throws IOException, InterruptedException {
-		return shellWinUnix(null, cmdWin, cmdUnix);
+		return shellWinUnix(null, null, cmdWin, cmdUnix);
 	}
 
 	/** Executes the given shell command (using {@code cmd} on windows and {@code sh} on unix). */
-	public Result shellWinUnix(File cwd, String cmdWin, String cmdUnix) throws IOException, InterruptedException {
+	public Result shellWinUnix(File cwd, Map<String, String> environment, String cmdWin, String cmdUnix) throws IOException, InterruptedException {
 		List<String> args;
 		if (FileSignature.machineIsWin()) {
 			args = Arrays.asList("cmd", "/c", cmdWin);
 		} else {
 			args = Arrays.asList("sh", "-c", cmdUnix);
 		}
-		return exec(cwd, args);
+		return exec(cwd, environment, new byte[0], args);
 	}
 
 	/** Creates a process with the given arguments. */
@@ -83,25 +84,23 @@ public Result exec(byte[] stdin, String... args) throws IOException, Interrupted
 
 	/** Creates a process with the given arguments. */
 	public Result exec(List<String> args) throws IOException, InterruptedException {
-		return exec((File) null, args);
-	}
-
-	/** Creates a process with the given arguments. */
-	public Result exec(File cwd, List<String> args) throws IOException, InterruptedException {
-		return exec(cwd, new byte[0], args);
+		return exec(null, args);
 	}
 
 	/** Creates a process with the given arguments, the given byte array is written to stdin immediately. */
 	public Result exec(byte[] stdin, List<String> args) throws IOException, InterruptedException {
-		return exec(null, stdin, args);
+		return exec(null, null, stdin, args);
 	}
 
 	/** Creates a process with the given arguments, the given byte array is written to stdin immediately. */
-	public Result exec(File cwd, byte[] stdin, List<String> args) throws IOException, InterruptedException {
+	public Result exec(File cwd, Map<String, String> environment, byte[] stdin, List<String> args) throws IOException, InterruptedException {
 		ProcessBuilder builder = new ProcessBuilder(args);
 		if (cwd != null) {
 			builder.directory(cwd);
 		}
+		if (environment != null) {
+			builder.environment().putAll(environment);
+		}
 		Process process = builder.start();
 		Future<byte[]> outputFut = threadStdOut.submit(() -> drainToBytes(process.getInputStream(), bufStdOut));
 		Future<byte[]> errorFut = threadStdErr.submit(() -> drainToBytes(process.getErrorStream(), bufStdErr));

plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenRunner.java

@@ -69,7 +69,7 @@ private ProcessRunner.Result run() throws IOException, InterruptedException {
 		Objects.requireNonNull(args, "Need to call withArguments() first");
 		// run maven with the given args in the given directory
 		String argsString = "-e " + String.join(" ", Arrays.asList(args));
-		return runner.shellWinUnix(projectDir, "mvnw " + argsString, "./mvnw " + argsString);
+		return runner.shellWinUnix(projectDir, environment, "mvnw " + argsString, "./mvnw " + argsString);
 	}
 
 	/** Runs the command and asserts that exit code is 0. */