#1594: Code cleanup and bug fixes

Author: laert-ll

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

@@ -4,7 +4,6 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.locks.ReentrantLock;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,13 +50,13 @@ protected void doRun() {
     GitContext git = this.context.getGitContext();
 
     if (git.hasUntrackedFiles(projectPath)) {
-      throw new CliException("Your local git repository has uncommitted changes. Please use 'git stash' and rerun on a clean repository.");
+      throw new CliException("Your local git repository has uncommitted changes. Please use 'git stash' and rerun on clean repo.");
     }
     if (warnIfFork(git, projectPath)) {
       confirmWarning("You seem to work on a fork. Releases should be done on the original repository!\nWe strongly recommend to abort and rerun on original repository.");
     }
     if (!this.context.isForceMode() && !isTopLevelProject(projectPath)) {
-      throw new CliException("Release has to be performed from the top-level project or using the force option (-f).");
+      throw new CliException("Release has to be performed from the top-level project or using force option.");
     }
 
     String currentVersion = getProjectVersion(projectPath);
@@ -76,15 +75,18 @@ protected void doRun() {
     }
 
     setProjectVersion(projectPath, releaseVersion);
-    git.commit(projectPath, "#release: set release version " + releaseVersion);
-    git.tag(projectPath, releaseVersion);
+    git.commit(projectPath, "set release version to " + releaseVersion);
+    git.tag(projectPath, "release/" + releaseVersion, "tagged version " + releaseVersion);
 
     buildAndDeploy();
 
     setProjectVersion(projectPath, nextVersion);
-    git.commit(projectPath, "#release: set next snapshot version " + nextVersion);
+    git.commit(projectPath, "set next version to " + nextVersion);
+    LOG.info("Local commits and tag need to be pushed now.\nYou now have the chance to review these changes manually before they are pushed.");
+    this.context.askToContinue("Do you want to continue?");
     git.push(projectPath);
 
+    LOG.info("Successfully released version {}.", releaseVersion);
   }
 
   private boolean warnIfFork(GitContext git, Path projectPath) {
@@ -158,9 +160,8 @@ private void buildAndDeploy() {
         return;
       }
       LOG.error("Release build failed!");
-      if (!this.context.question("Do you want to retry the release build?")) {
-        throw new CliException("Release build failed and was aborted! The release commit and tag were already created locally - "
-            + "undo them via 'git reset --hard HEAD~1' and 'git tag -d <version>' before retrying.");
+      if (!this.context.question("Do you want to retry the build (e.g. in case of a temporary network error)?")) {
+        throw new CliException("Release build failed and process aborted!\nYou should reset your local commits via 'git reset HEAD^'.");
       }
     }
   }

cli/src/main/java/com/devonfw/tools/ide/git/GitContext.java

@@ -213,12 +213,6 @@ default void reset(Path repository, String branch) {
    */
   String retrieveGitUrl(Path repository);
 
-  /**
-   * @param repository the {@link Path} to the git repository.
-   * @return the {@link List} of git tags of the given repository.
-   */
-  List<String> retrieveGitTags(Path repository);
-
   /**
    * @param repository the {@link Path} to the git repository.
    * @return the {@link List} of configured git remotes (output of {@code git remote -v}).
@@ -272,8 +266,9 @@ default void reset(Path repository, String branch) {
    *
    * @param repository the {@link Path} to the git repository.
    * @param tagName the name of the tag to create (e.g. "release/1.5.0").
+   * @param message the annotation message of the tag.
    */
-  void tag(Path repository, String tagName);
+  void tag(Path repository, String tagName, String message);
 
   /**
    * Pushes the local commits and tags of the given repository to the remote repository.

cli/src/main/java/com/devonfw/tools/ide/git/GitContextImpl.java

@@ -320,12 +320,6 @@ public String retrieveGitUrl(Path repository) {
     return runGitCommandAndGetSingleOutput("Failed to retrieve git URL for repository", repository, "config", "--get", "remote.origin.url");
   }
 
-  @Override
-  public List<String> retrieveGitTags(Path repository) {
-
-    return runGitCommand(repository, ProcessMode.DEFAULT_CAPTURE, "--no-pager", "tag", "--list").getOut();
-  }
-
   @Override
   public List<String> retrieveGitRemotes(Path repository) {
 
@@ -546,9 +540,9 @@ public void commit(Path repository, String message) {
   }
 
   @Override
-  public void tag(Path repository, String tagName) {
+  public void tag(Path repository, String tagName, String message) {
 
-    runGitCommand(repository, "tag", "-a", tagName, "-m", tagName);
+    runGitCommand(repository, "tag", "-a", tagName, "-m", message);
   }
 
   @Override

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

@@ -112,7 +112,7 @@ cmd.python.detail=Python is an object-oriented programming language, comparable
 cmd.quarkus=Tool commandlet for Quarkus (framework for cloud-native apps).
 cmd.quarkus.detail=Quarkus is a Kubernetes-native Java framework for building cloud-native applications. Detailed documentation can be found at https://quarkus.io/
 cmd.release=Performs a release of the project in your current working directory.
-cmd.release.detail=The `release` commandlet automates a release of the project in your current working directory. It ensures there are no uncommitted changes, warns if you work on a fork, determines the current version of your project and derives the release version and the next development (SNAPSHOT) version for you to confirm. It then sets the release version, commits and tags it via git (as `release/«version»`), builds and deploys the project, sets the next development version, commits, and (after your confirmation) pushes the changes and the tag. Build and deploy options can be configured per build-system via the variable `<TOOL>_RELEASE_OPTS` (e.g. `MVN_RELEASE_OPTS`). You may also supply additional arguments as `ide release «args»` that will be passed to the detected build command.
+cmd.release.detail=The `release` commandlet automates a release of the project in your current working directory. It ensures there are no uncommitted changes, warns if you work on a fork, determines the current version of your project and derives the release version and the next development (SNAPSHOT) version for you to confirm. It then sets the release version, commits and tags it via git (as `release/«version»`), builds and deploys the project, sets the next development version, commits, and (after your confirmation) pushes the changes and the tag. Build and deploy options can be configured via the variable `MVN_RELEASE_OPTS` (default `clean deploy -Dchangelist= -Pdeploy`). You may also supply additional arguments as `ide release «args»` that will be passed to the maven build command.
 cmd.release.val.args=Additional arguments to pass to the build and deploy command.
 cmd.repository=Set up pre-configured git repositories using 'ide repository setup <repository>'
 cmd.repository.detail=Without further arguments this will set up all pre-configured git repositories.\nAlso, you can provide an explicit git repo as `<repository>` argument and IDEasy will automatically clone, build and set up your project based on the existing property file.\nRepositories are configured in 'settings/repository/<repository>.properties' and can therefore be shared with your project team for automatic or optional setup.

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

@@ -112,7 +112,7 @@ cmd.python.detail=Python ist eine objektorientierte Programmiersprache, vergleic
 cmd.quarkus=Werkzeug Kommando für Quarkus (Framework für Cloud-native Anwendungen).
 cmd.quarkus.detail=Quarkus ist ein Kubernetes-native Java-Framework zur Entwicklung von Cloud-native Anwendungen. Detaillierte Dokumentation ist zu finden unter https://quarkus.io/
 cmd.release=Führt ein Release des Projekts in Ihrem aktuellen Arbeitsverzeichnis durch.
-cmd.release.detail=Der `release`-Befehl automatisiert ein Release des Projekts in Ihrem aktuellen Arbeitsverzeichnis. Er stellt sicher, dass keine uncommitteten Änderungen vorliegen, warnt wenn Sie auf einem Fork arbeiten, ermittelt die aktuelle Version Ihres Projekts und leitet daraus die Release-Version sowie die nächste Entwicklungsversion (SNAPSHOT) zur Bestätigung ab. Anschließend setzt er die Release-Version, committet und taggt sie via git (als `release/«version»`), baut und veröffentlicht das Projekt, setzt die nächste Entwicklungsversion, committet und pusht nach Ihrer Bestätigung die Änderungen und den Tag. Build- und Deploy-Optionen können pro Build-System über die Variable `<TOOL>_RELEASE_OPTS` (z. B. `MVN_RELEASE_OPTS`) konfiguriert werden. Sie können auch zusätzliche Argumente wie `ide release «args»` angeben, die an den erkannten Build-Befehl weitergeleitet werden.
+cmd.release.detail=Der `release`-Befehl automatisiert ein Release des Projekts in Ihrem aktuellen Arbeitsverzeichnis. Er stellt sicher, dass keine uncommitteten Änderungen vorliegen, warnt wenn Sie auf einem Fork arbeiten, ermittelt die aktuelle Version Ihres Projekts und leitet daraus die Release-Version sowie die nächste Entwicklungsversion (SNAPSHOT) zur Bestätigung ab. Anschließend setzt er die Release-Version, committet und taggt sie via git (als `release/«version»`), baut und veröffentlicht das Projekt, setzt die nächste Entwicklungsversion, committet und pusht nach Ihrer Bestätigung die Änderungen und den Tag. Build- und Deploy-Optionen können über die Variable `MVN_RELEASE_OPTS` (Standard `clean deploy -Dchangelist= -Pdeploy`) konfiguriert werden. Sie können auch zusätzliche Argumente wie `ide release «args»` angeben, die an den Maven-Build-Befehl weitergeleitet werden.
 cmd.release.val.args=Zusätzliche Argumente, die an den Build- und Deploy-Befehl übergeben werden.
 cmd.repository=Richtet das vorkonfigurierte Git Repository ein mittels 'ide repository setup <repository>'.
 cmd.repository.detail=Dies wird alle vorkonfigurierten Repositories einrichten. Rufen Sie einfach 'ide repository setup <your_project_name>' auf, ersetzen Sie <your_project_name> durch den Namen Ihrer Projektkonfigurationsdatei, die sich in 'settings/repository/your_project_name' befindet und IDEasy wird Ihr Projekt basierend auf der vorhandenen Eigenschaftsdatei automatisch klonen, bauen und einrichten.\nWenn Sie den Projektnamen weglassen, werden alle im Repository-Verzeichnis gefundenen Projekte vorkonfiguriert.

cli/src/test/java/com/devonfw/tools/ide/git/GitContextImplMock.java

@@ -223,7 +223,7 @@ public void commit(Path repository, String message) {
   }
 
   @Override
-  public void tag(Path repository, String tagName) {
+  public void tag(Path repository, String tagName, String message) {
     LOG.debug("Mock tag: {}", tagName);
   }
 
@@ -232,11 +232,6 @@ public void push(Path repository) {
     LOG.debug("Mock push");
   }
 
-  @Override
-  public List<String> retrieveGitTags(Path repository) {
-    return List.of();
-  }
-
   @Override
   public List<String> retrieveGitRemotes(Path repository) {
     return List.of();

cli/src/test/java/com/devonfw/tools/ide/git/GitContextMock.java

@@ -65,12 +65,6 @@ public String retrieveGitUrl(Path repository) {
     return MOCKED_URL_VALUE;
   }
 
-  @Override
-  public java.util.List<String> retrieveGitTags(Path repository) {
-
-    return java.util.Collections.emptyList();
-  }
-
   @Override
   public java.util.List<String> retrieveGitRemotes(Path repository) {
 
@@ -135,7 +129,7 @@ public void commit(Path repository, String message) {
   }
 
   @Override
-  public void tag(Path repository, String tagName) {
+  public void tag(Path repository, String tagName, String message) {
 
   }