[maven-release] branch master updated: [MRELEASE-851] javaHome parameter is ignored and inherited unexpectedly

[michaelo]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
     new f96c6bcb [MRELEASE-851] javaHome parameter is ignored and inherited 
unexpectedly
f96c6bcb is described below

commit f96c6bcbc1e20ddaa95e0bbc29d36a975953a95c
Author: Matthias Kampmeyer <mkampme...@mk-se.de>
AuthorDate: Mon Apr 17 11:32:35 2023 +0200

    [MRELEASE-851] javaHome parameter is ignored and inherited unexpectedly
    
    This closes #182
---
 .../org/apache/maven/shared/release/exec/ForkedMavenExecutor.java     | 4 ++++
 .../org/apache/maven/shared/release/exec/InvokerMavenExecutor.java    | 1 +
 .../java/org/apache/maven/plugins/release/AbstractReleaseMojo.java    | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
index 2b8d9f62..7a807aaf 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
@@ -106,6 +106,10 @@ public class ForkedMavenExecutor extends 
AbstractMavenExecutor {
 
             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/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
index 51d83df3..7a60e629 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
@@ -76,6 +76,7 @@ public class InvokerMavenExecutor extends 
AbstractMavenExecutor {
                 // 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
index 825f441e..99c48351 100644
--- 
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
      */