From e618c211b474bef9902a3ebfd435935f2da9745c Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Wed, 25 Mar 2020 20:03:07 +0300
Subject: [PATCH] Run test with full path to maven (KT-37654)

Prepare to mvn update on build server to fix sporadic
failures on Windows
---
 .../org.jetbrains.kotlin.maven/MavenProject.java    | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

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<String> 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<String, String> 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<String> buildCmd(String... args) {
         List<String> cmd = new ArrayList<String>();
 
@@ -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";