[MRELEASE-851] javaHome parameter is ignored and inherited unexpectedly

This closes #182
apache · Apr 20, 2023 · f96c6bc · f96c6bc
1 parent 5d3f9b7
commit f96c6bc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/...lease-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java b/...lease-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
@@ -106,6 +106,10 @@ public void executeGoals(
 
             cl.addEnvironment("MAVEN_TERMINATE_CMD", "on");
 
+            if (releaseEnvironment.getJavaHome() != null) {
+                cl.addEnvironment("JAVA_HOME", releaseEnvironment.getJavaHome().getAbsolutePath());
+            }
+
             if (settingsFile != null) {
                 cl.createArg().setValue("-s");
                 cl.createArg().setFile(settingsFile);

diff --git a/...ease-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java b/...ease-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
@@ -76,6 +76,7 @@ public void executeGoals(
                 // fix for MRELEASE-1105
                 // .addShellEnvironment( "MAVEN_DEBUG_OPTS", "" )
                 .setBatchMode(true)
+                .setJavaHome(releaseEnvironment.getJavaHome())
                 .setOutputHandler(getLogger()::info)
                 .setErrorHandler(getLogger()::error);
 

diff --git a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
@@ -91,7 +91,7 @@ public abstract class AbstractReleaseMojo extends AbstractMojo {
     private File mavenHome;
 
     /**
-     * The {@code JAVA_HOME} parameter to use for forked Maven invocations.
+     * The Java home parameter to use for forked Maven invocations.
      *
      * @since 2.0-beta-8
      */