Merge branch 'main' into fix/1130-improve-behaviour-on-ambigous-xpath-match

Author: hohwille

CHANGELOG.adoc

@@ -6,6 +6,10 @@ This file documents all notable changes to https://github.com/devonfw/IDEasy[IDE
 
 Release with new features and bugfixes:
 
+* https://github.com/devonfw/IDEasy/issues/1153[#1153]: Print SystemInfo in ide status
+* https://github.com/devonfw/IDEasy/issues/1006[#1006]: Eclipse automation opens UI that blocks further processing until closed
+* https://github.com/devonfw/IDEasy/issues/1039[#1039]: Update Jasypt commandlet implementation to run Java version from dependencies.json
+
 The full list of changes for this release can be found in https://github.com/devonfw/IDEasy/milestone/24?closed=1[milestone 2025.03.002].
 
 == 2025.03.001

cli/pom.xml

@@ -266,10 +266,10 @@
                   <goal>run</goal>
                 </goals>
                 <configuration>
-                  <tasks>
+                  <target>
                     <move file="${project.basedir}/target/msi/ideasy.msi"
                       tofile="${project.basedir}/target/${project.artifactId}-${revision}-windows-x64.msi"/>
-                  </tasks>
+                  </target>
                 </configuration>
               </execution>
             </executions>

cli/src/main/java/com/devonfw/tools/ide/commandlet/StatusCommandlet.java

@@ -7,6 +7,7 @@
 import com.devonfw.tools.ide.environment.EnvironmentVariables;
 import com.devonfw.tools.ide.git.GitContext;
 import com.devonfw.tools.ide.migration.IdeMigrator;
+import com.devonfw.tools.ide.os.SystemInfo;
 import com.devonfw.tools.ide.tool.IdeasyCommandlet;
 import com.devonfw.tools.ide.version.VersionIdentifier;
 
@@ -43,6 +44,13 @@ public void run() {
       logMigrationStatus();
     }
     new IdeasyCommandlet(this.context, null).checkIfUpdateIsAvailable();
+    logSystemInfo();
+  }
+
+  private void logSystemInfo() {
+    SystemInfo systemInfo = this.context.getSystemInfo();
+    this.context.info("Your operating system is {}({})@{} [{}@{}]", systemInfo.getOs(), systemInfo.getOsVersion(), systemInfo.getArchitecture(),
+        systemInfo.getOsName(), systemInfo.getArchitectureName());
   }
 
   private void logSettingsLegacyStatus() {

cli/src/main/java/com/devonfw/tools/ide/tool/eclipse/Eclipse.java

@@ -57,12 +57,6 @@ protected void configureToolBinary(ProcessContext pc, ProcessMode processMode, P
   @Override
   protected void configureToolArgs(ProcessContext pc, ProcessMode processMode, ProcessErrorHandling errorHandling, String... args) {
 
-    if ((args.length > 0) && !VMARGS.equals(args[0])) {
-      String vmArgs = this.context.getVariables().get("ECLIPSE_VMARGS");
-      if ((vmArgs != null) && !vmArgs.isEmpty()) {
-        pc.addArg(VMARGS).addArg(vmArgs);
-      }
-    }
     // configure workspace location
     pc.addArg("-data").addArg(this.context.getWorkspacePath());
     // use keyring from user home to keep secrets and share across projects and workspaces
@@ -76,6 +70,12 @@ protected void configureToolArgs(ProcessContext pc, ProcessMode processMode, Pro
       pc.addArg("-consoleLog").addArg("-nosplash");
     }
     super.configureToolArgs(pc, processMode, errorHandling, args);
+    if ((args.length > 0) && !VMARGS.equals(args[0])) {
+      String vmArgs = this.context.getVariables().get("ECLIPSE_VMARGS");
+      if ((vmArgs != null) && !vmArgs.isEmpty()) {
+        pc.addArg(VMARGS).addArg(vmArgs);
+      }
+    }
   }
 
   @Override

cli/src/main/java/com/devonfw/tools/ide/tool/jasypt/Jasypt.java

@@ -1,19 +1,18 @@
 package com.devonfw.tools.ide.tool.jasypt;
 
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Set;
 
 import com.devonfw.tools.ide.common.Tag;
 import com.devonfw.tools.ide.context.IdeContext;
-import com.devonfw.tools.ide.nls.NlsBundle;
+import com.devonfw.tools.ide.process.ProcessContext;
+import com.devonfw.tools.ide.process.ProcessErrorHandling;
+import com.devonfw.tools.ide.process.ProcessMode;
+import com.devonfw.tools.ide.process.ProcessResult;
 import com.devonfw.tools.ide.property.EnumProperty;
 import com.devonfw.tools.ide.property.PasswordProperty;
 import com.devonfw.tools.ide.tool.LocalToolCommandlet;
 import com.devonfw.tools.ide.tool.ToolCommandlet;
-import com.devonfw.tools.ide.tool.java.Java;
 
 /**
  * {@link ToolCommandlet} for <a href="http://www.jasypt.org/">Jasypt</a>, The java library which allows to add basic encryption capabilities with minimum
@@ -51,7 +50,7 @@ public Jasypt(IdeContext context) {
   @Override
   protected void initProperties() {
 
-    // Empty on purpose
+    // avoid generic multi-valued arguments
   }
 
   @Override
@@ -61,41 +60,35 @@ protected boolean isExtract() {
   }
 
   @Override
-  public void run() {
+  public ProcessResult runTool(ProcessMode processMode, ProcessErrorHandling errorHandling, ProcessContext pc, String... args) {
 
-    Path toolPath = getToolPath();
-    if (!toolPath.toFile().exists()) {
-      super.install(true);
-    }
+    return runJasypt(determineJasyptMainClass(), pc, processMode);
+  }
 
+  private String determineJasyptMainClass() {
     JasyptCommand command = this.command.getValue();
-    switch (command) {
-      case ENCRYPT:
-        runJasypt(CLASS_NAME_ENCRYPTION);
-        break;
-      case DECRYPT:
-        runJasypt(CLASS_NAME_DECRYPTION);
-        break;
-
-      default:
-    }
+    return switch (command) {
+      case ENCRYPT -> CLASS_NAME_ENCRYPTION;
+      case DECRYPT -> CLASS_NAME_DECRYPTION;
+    };
   }
 
-  private void runJasypt(String className) {
+  private ProcessResult runJasypt(String className, ProcessContext pc, ProcessMode processMode) {
 
-    List<String> arguments = new ArrayList<>(
-        Arrays.asList("-cp", resolveJasyptJarPath().toString(), className, "password=" + this.masterPassword.getValue(),
-            "input=" + this.secret.getValue()));
+    pc = pc.executable("java").addArgs("-cp", resolveJasyptJarPath().toString(), className, "password=" + this.masterPassword.getValue(),
+        "input=" + this.secret.getValue());
 
     String jasyptOpts = this.context.getVariables().get("JASYPT_OPTS");
-    if (jasyptOpts != null && !jasyptOpts.trim().isEmpty()) {
-      String[] jasyptOptions = jasyptOpts.split("\\s+");
-
-      arguments.addAll(Arrays.asList(jasyptOptions));
+    if (jasyptOpts != null) {
+      jasyptOpts = jasyptOpts.trim();
+      if (!jasyptOpts.isEmpty()) {
+        for (String opt : jasyptOpts.split("\\s+")) {
+          pc = pc.addArg(opt);
+        }
+      }
     }
 
-    Java java = getCommandlet(Java.class);
-    java.runTool(arguments.toArray(i -> new String[i]));
+    return pc.run(processMode);
   }
 
   private Path resolveJasyptJarPath() {
@@ -105,10 +98,4 @@ private Path resolveJasyptJarPath() {
     return toolPath.resolve("jasypt-" + installedVersion + ".jar");
   }
 
-  @Override
-  public void printHelp(NlsBundle bundle) {
-
-    this.context.info(
-        "To get detailed help about the usage of the jasypt CLI tools, see http://www.jasypt.org/cli.html#");
-  }
 }

cli/src/main/resources/nls/Help.properties

@@ -48,7 +48,7 @@ cmd.install.detail=To see all tools available for installation, call "ide help"
 cmd.intellij=Tool commandlet for IntelliJ (IDE)
 cmd.intellij.detail=IntelliJ is a popular Integrated Development Environment for Java developed by JetBrains. Detailed documentation can be found at https://www.jetbrains.com/idea/documentation/
 cmd.jasypt=Tool commandlet for Jasypt (encryption/decryption).
-cmd.jasypt.detail=Jasypt is a library for encrypting and decrypting sensitive data in Java applications. Detailed documentation can be found at http://www.jasypt.org/
+cmd.jasypt.detail=Jasypt is a library for encrypting and decrypting sensitive data in Java applications. Additional Jasypt options like "algorithm" can be configured via variable JASYPT_OPTS. Detailed documentation can be found at http://www.jasypt.org/
 cmd.jasypt.val.command=Modes (encrypt | decrypt)
 cmd.jasypt.val.masterPassword=master password.
 cmd.jasypt.val.secret=The secret to be encrypted or decrypted.

cli/src/main/resources/nls/Help_de.properties

@@ -48,7 +48,7 @@ cmd.install.detail=Die Liste an zur Installation verfügbaren Werkzeugen können
 cmd.intellij=Werkzeug Kommando für Intellij (IDE)
 cmd.intellij.detail=IntelliJ ist eine beliebte Java-Entwicklungsumgebung, von JetBrains entwickelt. Detaillierte Dokumentation ist zu finden unter https://www.jetbrains.com/idea/documentation/
 cmd.jasypt=Werkzeug Kommando für Jasypt.
-cmd.jasypt.detail=Jasypt ist eine Bibliothek zum Verschlüsseln und Entschlüsseln sensibler Daten in Java-Anwendungen. Detaillierte Dokumentation ist zu finden unter http://www.jasypt.org/
+cmd.jasypt.detail=Jasypt ist eine Bibliothek zum Verschlüsseln und Entschlüsseln sensibler Daten in Java-Anwendungen. Zusätzliche Jasypt Optionen wie "algorithm" können mittels der Variable JASYPT_OPTS konfiguriert werden. Detaillierte Dokumentation ist zu finden unter http://www.jasypt.org/
 cmd.jasypt.val.command=Mode (encrypt | decrypt)
 cmd.jasypt.val.masterPassword=master Passwort.
 cmd.jasypt.val.secret=Das zu verschlüsselnde oder zu entschlüsselnde Geheimnis.

documentation/setup.adoc

@@ -25,8 +25,8 @@ The latest release of `IDEasy` can be downloaded from https://github.com/devonfw
 Extract the contents of the downloaded archive (`ide-cli-*.tar.gz`) to a new folder and run `setup` in this folder (on windows double-click on `setup.bat`).
 
 To get started read the link:usage.adoc[usage].
-After the installation process, you can create a new project by typing: `ide create <project>`, replace `<project>` with your project name.
-Switch to the project folder e.g. `cd <project>` and install or configure tools for your project as needed.
+After the installation process, you can create a new project by typing in bash: `ide create <project>`, replace `<project>` with your project name.
+Switch to the project folder e.g. `cd <project>` and install or configure tools for your project as needed (for further details click link:project.adoc[here]).
 
 === Tweak installation location