From e4f0f2372445c020d82c0179bbed563e77a22902 Mon Sep 17 00:00:00 2001 From: Yevhen Vydolob Date: Tue, 13 Jun 2017 15:45:45 +0300 Subject: [PATCH] #5356 use java for maven server which ws-agent use (#5363) Signed-off-by: Even Vidolob --- .../che/plugin/maven/server/MavenServerManager.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/MavenServerManager.java b/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/MavenServerManager.java index b42cfae6481..b30a4eef9dd 100644 --- a/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/MavenServerManager.java +++ b/plugins/plugin-maven/che-plugin-maven-server/src/main/java/org/eclipse/che/plugin/maven/server/MavenServerManager.java @@ -13,7 +13,6 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.inject.name.Named; - import org.eclipse.che.maven.data.MavenExplicitProfiles; import org.eclipse.che.maven.data.MavenModel; import org.eclipse.che.maven.server.MavenRemoteServer; @@ -192,7 +191,7 @@ protected synchronized void cleanUp() { public JavaParameters buildMavenServerParameters() { JavaParameters parameters = new JavaParameters(); - parameters.setJavaExecutable("java"); + parameters.setJavaExecutable(System.getProperties().getProperty("java.home") + "/bin/java"); parameters.setWorkingDirectory(System.getProperty("java.io.tmpdir")); parameters.setMainClassName(MAVEN_SERVER_MAIN); //TODO read and set MAVEN_OPTS system properties @@ -203,9 +202,7 @@ public JavaParameters buildMavenServerParameters() { String mavenHome = System.getenv("M2_HOME"); addDirToClasspath(classPath, new File(mavenHome, "lib")); File bootDir = new File(mavenHome, "boot"); - File[] classworlds = bootDir.listFiles((dir, name) -> { - return name.contains("classworlds"); - }); + File[] classworlds = bootDir.listFiles((dir, name) -> name.contains("classworlds")); if (classworlds != null) { for (File file : classworlds) {