From f24a728c291e36ceb3e90f946645e2ac00bfcf26 Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Fri, 28 Feb 2025 18:19:04 +0100 Subject: [PATCH 1/2] #1058: fixed missing JAVA_HOME env var Fixes: #1058 ### Implements: * added missing JAVA_HOME to environment variables --- .../main/java/com/devonfw/tools/ide/tool/java/Java.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/java/Java.java b/cli/src/main/java/com/devonfw/tools/ide/tool/java/Java.java index 7786960c3..dae02411b 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/java/Java.java +++ b/cli/src/main/java/com/devonfw/tools/ide/tool/java/Java.java @@ -4,8 +4,10 @@ import com.devonfw.tools.ide.common.Tag; import com.devonfw.tools.ide.context.IdeContext; +import com.devonfw.tools.ide.process.EnvironmentContext; import com.devonfw.tools.ide.tool.LocalToolCommandlet; import com.devonfw.tools.ide.tool.ToolCommandlet; +import com.devonfw.tools.ide.tool.ToolInstallation; /** * {@link ToolCommandlet} for Java (Java Virtual Machine and Java Development Kit). @@ -22,6 +24,13 @@ public Java(IdeContext context) { super(context, "java", Set.of(Tag.JAVA, Tag.RUNTIME)); } + @Override + public void setEnvironment(EnvironmentContext environmentContext, ToolInstallation toolInstallation, boolean extraInstallation) { + + super.setEnvironment(environmentContext, toolInstallation, extraInstallation); + environmentContext.withEnvVar("JAVA_HOME", toolInstallation.linkDir().toString()); + } + @Override public String getToolHelpArguments() { From d22844c89e4ffe703896a776b37a4322ffb5b73a Mon Sep 17 00:00:00 2001 From: jan-vcapgemini Date: Mon, 3 Mar 2025 11:02:02 +0100 Subject: [PATCH 2/2] #1058: removed unnecessary withEnvVar call --- cli/src/main/java/com/devonfw/tools/ide/tool/java/Java.java | 1 - 1 file changed, 1 deletion(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/java/Java.java b/cli/src/main/java/com/devonfw/tools/ide/tool/java/Java.java index dae02411b..34d97b3e0 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/java/Java.java +++ b/cli/src/main/java/com/devonfw/tools/ide/tool/java/Java.java @@ -28,7 +28,6 @@ public Java(IdeContext context) { public void setEnvironment(EnvironmentContext environmentContext, ToolInstallation toolInstallation, boolean extraInstallation) { super.setEnvironment(environmentContext, toolInstallation, extraInstallation); - environmentContext.withEnvVar("JAVA_HOME", toolInstallation.linkDir().toString()); } @Override