diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 57e08a1107..c3b1e70b9c 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -31,8 +31,10 @@ jobs:
current_version="${maven_config/#*-Drevision=}"
current_version="${current_version/ */}"
current_version="${current_version/-SNAPSHOT/-$(date +%m_%d_%H)-SNAPSHOT}"
- cd cli
- mvn -B -ntp -Pnative -DskipTests=true -Drevision=${current_version} package
+ cd gui-launcher
+ mvn -B -ntp -DskipTests clean install
+ cd ../cli
+ mvn -B -ntp -Passembly,native -DskipTests=true -Drevision=${current_version} package
- name: Upload native image
uses: actions/upload-artifact@v4
with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 45a21ca719..dab05340d3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,8 +30,10 @@ jobs:
current_version="${maven_config/#*-Drevision=}"
current_version="${current_version/ */}"
next_version="${current_version/-SNAPSHOT/}"
- cd cli
- mvn -B -ntp -Drevision=${next_version} -Pnative -DskipTests=true package
+ cd gui-launcher
+ mvn -B -ntp -DskipTests clean install
+ cd ../cli
+ mvn -B -ntp -Drevision=${next_version} -Passembly,native -DskipTests=true package
- name: Upload native image
uses: actions/upload-artifact@v4
with:
diff --git a/cli/pom.xml b/cli/pom.xml
index c295efab8f..c256a75706 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -203,6 +203,30 @@
assembly
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+ copy-gui-pom
+ prepare-package
+
+ run
+
+
+
+
+
+
+
+
+
+
+
org.apache.maven.plugins
diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/IdeasyCommandlet.java b/cli/src/main/java/com/devonfw/tools/ide/tool/IdeasyCommandlet.java
index 2405ad193b..536c3c47aa 100644
--- a/cli/src/main/java/com/devonfw/tools/ide/tool/IdeasyCommandlet.java
+++ b/cli/src/main/java/com/devonfw/tools/ide/tool/IdeasyCommandlet.java
@@ -197,6 +197,7 @@ public void installIdeasy(Path cwd) {
success &= addInstallationArtifact(cwd, "bin", true, installationArtifacts);
success &= addInstallationArtifact(cwd, "functions", true, installationArtifacts);
success &= addInstallationArtifact(cwd, "internal", true, installationArtifacts);
+ success &= addInstallationArtifact(cwd, "gui", true, installationArtifacts);
success &= addInstallationArtifact(cwd, "system", true, installationArtifacts);
success &= addInstallationArtifact(cwd, "IDEasy.pdf", true, installationArtifacts);
success &= addInstallationArtifact(cwd, "setup", true, installationArtifacts);
diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/gui/Gui.java b/cli/src/main/java/com/devonfw/tools/ide/tool/gui/Gui.java
index af207ed6d0..837578e7f7 100644
--- a/cli/src/main/java/com/devonfw/tools/ide/tool/gui/Gui.java
+++ b/cli/src/main/java/com/devonfw/tools/ide/tool/gui/Gui.java
@@ -12,12 +12,8 @@
import com.devonfw.tools.ide.process.ProcessContext;
import com.devonfw.tools.ide.process.ProcessContextImpl;
import com.devonfw.tools.ide.process.ProcessMode;
-import com.devonfw.tools.ide.tool.ToolEdition;
-import com.devonfw.tools.ide.tool.ToolEditionAndVersion;
-import com.devonfw.tools.ide.tool.ToolInstallRequest;
import com.devonfw.tools.ide.tool.java.Java;
import com.devonfw.tools.ide.tool.mvn.Mvn;
-import com.devonfw.tools.ide.version.VersionRange;
/**
* {@link Commandlet} to launch the IDEasy GUI.
@@ -46,22 +42,13 @@ protected void doRun() {
ProcessContext processContext = new ProcessContextImpl(this.context);
- ToolInstallRequest toolInstallRequest = new ToolInstallRequest(false);
- toolInstallRequest.setProcessContext(processContext);
- toolInstallRequest.setRequested(
- new ToolEditionAndVersion(
- new ToolEdition("java", "java"),
- VersionRange.of("[25,)")
- )
- );
-
Java java = this.context.getCommandletManager().getCommandlet(Java.class);
- java.install(toolInstallRequest);
+ Mvn mvn = this.context.getCommandletManager().getCommandlet(Mvn.class);
+ java.install(false);
+ mvn.install(false);
LOG.debug("Starting GUI via commandlet");
- Mvn mvn = context.getCommandletManager().getCommandlet(Mvn.class);
-
Path pomPath = context.getIdeInstallationPath().resolve("gui/pom.xml");
if (!Files.exists(pomPath)) {
LOG.error("Fatal error: The pom.xml file required for launching the IDEasy GUI could not be found in expected location: {}", pomPath);
diff --git a/gui-launcher/pom.xml b/gui-launcher/pom.xml
index 6979124d8d..a2ee96a325 100644
--- a/gui-launcher/pom.xml
+++ b/gui-launcher/pom.xml
@@ -22,36 +22,4 @@
-
-
- assembly
-
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
-
-
- copy-gui-pom
- prepare-package
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-