From 17cc299f8992c67b16ac543ffcec4e034c4639cc Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Tue, 26 Nov 2013 19:02:39 +0400
Subject: [PATCH] Allow to pass parameters for MavenEmbedder via system
 properties.

---
 .../idea/maven/server/MavenServerManager.java         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
index b4c440bfd78c..566f47074709 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
@@ -258,6 +258,11 @@ public class MavenServerManager extends RemoteObjectWrapper<MavenServer> impleme
           params.getVMParametersList().addParametersString("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=" + mavenEmbedderDebugPort);
         }
 
+        String mavenEmbedderParameters = System.getProperty("idea.maven.embedder.parameters");
+        if (mavenEmbedderParameters != null) {
+          params.getProgramParametersList().addParametersString(mavenEmbedderParameters);
+        }
+
         return params;
       }
 
@@ -303,9 +308,9 @@ public class MavenServerManager extends RemoteObjectWrapper<MavenServer> impleme
     String root = pluginFileOrDir.getParent();
 
     boolean useMaven2 = this.useMaven2;
-    if (ApplicationManager.getApplication().isUnitTestMode()) {
-      useMaven2 = true;
-    }
+//    if (ApplicationManager.getApplication().isUnitTestMode()) {
+//      useMaven2 = true;
+//    }
 
     if (pluginFileOrDir.isDirectory()) {
       classpath.add(new File(root, "maven-server-api"));