Merge pull request #1771 from usethesource/fix-non-java-home-inheritance

Copy calculated JAVA_HOME path to make sure maven works
usethesource · Feb 10, 2023 · 86ad532 · 86ad532
2 parents 3f5c1b9 + c644f2c
commit 86ad532
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/org/rascalmpl/library/util/PathConfig.java b/src/org/rascalmpl/library/util/PathConfig.java
@@ -672,6 +672,7 @@ private static IList getPomXmlCompilerClasspath(ISourceLocation manifestRoot) {
             );
 
             processBuilder.directory(new File(manifestRoot.getPath()));
+            processBuilder.environment().put("JAVA_HOME", System.getProperty("java.home", System.getenv("JAVA_HOME")));
 
             Process process = processBuilder.start();
 
@@ -720,6 +721,7 @@ private static void installNecessaryMavenPlugins(String mvnCommand) {
                 "-DartifactId=maven-dependency-plugin", 
                 "-Dversion=2.8",
                 trustStoreFix());
+            processBuilder.environment().put("JAVA_HOME", System.getProperty("java.home", System.getenv("JAVA_HOME")));
 
             Process process = processBuilder.start();
             if (process.waitFor() != 0) {