Skip to content

Commit f96c6bc

Browse files
mkampmeymichael-o
authored andcommitted
[MRELEASE-851] javaHome parameter is ignored and inherited unexpectedly
This closes #182
1 parent 5d3f9b7 commit f96c6bc

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java

+4
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@ public void executeGoals(
106106

107107
cl.addEnvironment("MAVEN_TERMINATE_CMD", "on");
108108

109+
if (releaseEnvironment.getJavaHome() != null) {
110+
cl.addEnvironment("JAVA_HOME", releaseEnvironment.getJavaHome().getAbsolutePath());
111+
}
112+
109113
if (settingsFile != null) {
110114
cl.createArg().setValue("-s");
111115
cl.createArg().setFile(settingsFile);

maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public void executeGoals(
7676
// fix for MRELEASE-1105
7777
// .addShellEnvironment( "MAVEN_DEBUG_OPTS", "" )
7878
.setBatchMode(true)
79+
.setJavaHome(releaseEnvironment.getJavaHome())
7980
.setOutputHandler(getLogger()::info)
8081
.setErrorHandler(getLogger()::error);
8182

maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public abstract class AbstractReleaseMojo extends AbstractMojo {
9191
private File mavenHome;
9292

9393
/**
94-
* The {@code JAVA_HOME} parameter to use for forked Maven invocations.
94+
* The Java home parameter to use for forked Maven invocations.
9595
*
9696
* @since 2.0-beta-8
9797
*/

0 commit comments

Comments
 (0)