diff --git a/libraries/tools/kotlin-maven-plugin-test/src/test/java/org.jetbrains.kotlin.maven/MavenProject.java b/libraries/tools/kotlin-maven-plugin-test/src/test/java/org.jetbrains.kotlin.maven/MavenProject.java index 23fb77be21a..f6c3783c3d7 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/test/java/org.jetbrains.kotlin.maven/MavenProject.java +++ b/libraries/tools/kotlin-maven-plugin-test/src/test/java/org.jetbrains.kotlin.maven/MavenProject.java @@ -34,7 +34,6 @@ class MavenProject { MavenExecutionResult exec(String... targets) throws Exception { List cmd = buildCmd(targets); ProcessBuilder processBuilder = new ProcessBuilder(cmd); - setUpEnvVars(processBuilder.environment()); processBuilder.directory(workingDir); processBuilder.redirectErrorStream(true); @@ -47,13 +46,6 @@ class MavenProject { return new MavenExecutionResult(stdout, workingDir, exitCode); } - private void setUpEnvVars(Map env) throws IOException { - String mavenHome = getNotNullSystemProperty("maven.home"); - env.put("M2_HOME", mavenHome); - String mavenPath = mavenHome + File.separator + "bin"; - env.put("PATH", env.get("PATH") + File.pathSeparator + mavenPath); - } - private List buildCmd(String... args) { List cmd = new ArrayList(); @@ -65,7 +57,10 @@ class MavenProject { cmd.add("/bin/bash"); } - cmd.add("mvn"); + String mavenHome = getNotNullSystemProperty("maven.home"); + String mavenBin = mavenHome + File.separator + "bin/mvn"; + + cmd.add(mavenBin); cmd.add("-Dkotlin.compiler.incremental.log.level=info"); String kotlinVersionProperty = "kotlin.version";