diff --git a/cli/src/main/java/com/devonfw/tools/ide/commandlet/CommandletManagerImpl.java b/cli/src/main/java/com/devonfw/tools/ide/commandlet/CommandletManagerImpl.java index ee8c5427f..1deff70e8 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/commandlet/CommandletManagerImpl.java +++ b/cli/src/main/java/com/devonfw/tools/ide/commandlet/CommandletManagerImpl.java @@ -12,7 +12,6 @@ import com.devonfw.tools.ide.tool.androidstudio.AndroidStudio; import com.devonfw.tools.ide.tool.aws.Aws; import com.devonfw.tools.ide.tool.az.Azure; -import com.devonfw.tools.ide.tool.cobigen.Cobigen; import com.devonfw.tools.ide.tool.docker.Docker; import com.devonfw.tools.ide.tool.dotnet.DotNet; import com.devonfw.tools.ide.tool.eclipse.Eclipse; @@ -99,7 +98,6 @@ public CommandletManagerImpl(IdeContext context) { add(new Vscode(context)); add(new Azure(context)); add(new Aws(context)); - add(new Cobigen(context)); add(new Jmc(context)); add(new DotNet(context)); add(new Intellij(context)); diff --git a/cli/src/main/java/com/devonfw/tools/ide/maven/MavenMetadata.java b/cli/src/main/java/com/devonfw/tools/ide/maven/MavenMetadata.java index a7730499d..c3ebf3a08 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/maven/MavenMetadata.java +++ b/cli/src/main/java/com/devonfw/tools/ide/maven/MavenMetadata.java @@ -41,7 +41,7 @@ public MavenMetadata(String groupId, String artifactId, MavenVersioning versioni } /** - * @return the maven groupId (e.g. "com.devonfw.cobigen"). + * @return the maven groupId. */ @JsonProperty(GROUP_ID) public String getGroupId() { @@ -59,7 +59,7 @@ public void setGroupId(String groupId) { } /** - * @return the maven artifactId (e.g. "cobigen-cli"). + * @return the maven artifactId. */ @JsonProperty(ARTIFACT_ID) public String getArtifactId() { diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/cobigen/Cobigen.java b/cli/src/main/java/com/devonfw/tools/ide/tool/cobigen/Cobigen.java deleted file mode 100644 index 73f338aa7..000000000 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/cobigen/Cobigen.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.devonfw.tools.ide.tool.cobigen; - -import java.util.Set; - -import com.devonfw.tools.ide.common.Tag; -import com.devonfw.tools.ide.context.IdeContext; -import com.devonfw.tools.ide.tool.LocalToolCommandlet; -import com.devonfw.tools.ide.tool.ToolCommandlet; -import com.devonfw.tools.ide.tool.mvn.Mvn; - -/** - * {@link ToolCommandlet} for cobigen CLI (cobigen). - */ -public class Cobigen extends LocalToolCommandlet { - - /** - * The constructor. - * - * @param context the {@link IdeContext}. - */ - public Cobigen(IdeContext context) { - - super(context, "cobigen", Set.of(Tag.GENERATOR)); - } - - @Override - public boolean install(boolean silent) { - - getCommandlet(Mvn.class).install(); - return super.install(silent); - } - -} diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/cobigen/CobigenUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/tool/cobigen/CobigenUrlUpdater.java deleted file mode 100644 index 2ed88d3f7..000000000 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/cobigen/CobigenUrlUpdater.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.devonfw.tools.ide.tool.cobigen; - -import com.devonfw.tools.ide.url.updater.MavenBasedUrlUpdater; - -/** - * {@link MavenBasedUrlUpdater} for cobigen-cli. - */ -public class CobigenUrlUpdater extends MavenBasedUrlUpdater { - - @Override - protected String getTool() { - - return "cobigen"; - } - - @Override - protected String getExtension() { - - return ".tar.gz"; - } - - @Override - protected String getMavenGroupIdPath() { - - return "com/devonfw/cobigen"; - } - - @Override - protected String getMavenArtifcatId() { - - return "cli"; - } -} diff --git a/cli/src/main/java/com/devonfw/tools/ide/url/updater/GithubUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/url/updater/GithubUrlUpdater.java index 99717aa96..0f3d97534 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/url/updater/GithubUrlUpdater.java +++ b/cli/src/main/java/com/devonfw/tools/ide/url/updater/GithubUrlUpdater.java @@ -29,7 +29,7 @@ protected Class getJsonObjectType() { protected abstract String getGithubOrganization(); /** - * @return the github repository name (e.g. "cobigen"). + * @return the github repository name. */ protected String getGithubRepository() { diff --git a/cli/src/main/java/com/devonfw/tools/ide/url/updater/MavenBasedUrlUpdater.java b/cli/src/main/java/com/devonfw/tools/ide/url/updater/MavenBasedUrlUpdater.java index 1cee859c6..2271a15c4 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/url/updater/MavenBasedUrlUpdater.java +++ b/cli/src/main/java/com/devonfw/tools/ide/url/updater/MavenBasedUrlUpdater.java @@ -28,12 +28,12 @@ public MavenBasedUrlUpdater() { } /** - * @return the maven groupId as path (e.g. "com/devonfw/cobigen"). + * @return the maven groupId as path. */ protected abstract String getMavenGroupIdPath(); /** - * @return the maven artifactId (e.g. "cobigen-cli"). + * @return the maven artifactId. */ protected abstract String getMavenArtifcatId(); diff --git a/cli/src/main/java/com/devonfw/tools/ide/url/updater/UpdateManager.java b/cli/src/main/java/com/devonfw/tools/ide/url/updater/UpdateManager.java index b865ae047..974de703c 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/url/updater/UpdateManager.java +++ b/cli/src/main/java/com/devonfw/tools/ide/url/updater/UpdateManager.java @@ -11,7 +11,6 @@ import com.devonfw.tools.ide.tool.androidstudio.AndroidStudioUrlUpdater; import com.devonfw.tools.ide.tool.aws.AwsUrlUpdater; import com.devonfw.tools.ide.tool.az.AzureUrlUpdater; -import com.devonfw.tools.ide.tool.cobigen.CobigenUrlUpdater; import com.devonfw.tools.ide.tool.docker.DockerDesktopUrlUpdater; import com.devonfw.tools.ide.tool.docker.DockerRancherDesktopUrlUpdater; import com.devonfw.tools.ide.tool.dotnet.DotNetUrlUpdater; @@ -60,7 +59,7 @@ public class UpdateManager extends AbstractProcessorWithTimeout { private final UrlRepository urlRepository; private final List updaters = Arrays.asList(new AndroidStudioUrlUpdater(), new AwsUrlUpdater(), - new AzureUrlUpdater(), new CobigenUrlUpdater(), new DockerDesktopUrlUpdater(), new DotNetUrlUpdater(), + new AzureUrlUpdater(), new DockerDesktopUrlUpdater(), new DotNetUrlUpdater(), new EclipseCppUrlUpdater(), new EclipseJeeUrlUpdater(), new EclipseJavaUrlUpdater(), new GCloudUrlUpdater(), new GcViewerUrlUpdater(), new GhUrlUpdater(), new GraalVmCommunityUpdater(), new GraalVmOracleUrlUpdater(), new GradleUrlUpdater(), new HelmUrlUpdater(), new IntellijUrlUpdater(), new JasyptUrlUpdater(), diff --git a/cli/src/main/resources/nls/Help.properties b/cli/src/main/resources/nls/Help.properties index 18d779d29..21f34002e 100644 --- a/cli/src/main/resources/nls/Help.properties +++ b/cli/src/main/resources/nls/Help.properties @@ -9,8 +9,6 @@ cmd.az.detail=The Azure Command-Line Interface (CLI) is a tool for creating and cmd.build=Runs a build job with given arguments. cmd.build.detail=The `build` commandlet is an abstraction of build systems like https://maven.apache.org/, https://gradle.org/, https://yarnpkg.com/, https://www.npmjs.com/, etc.\nIt will auto-detect your build-system (via existence of files like `pom.xml`, `package.json`, etc.). According to this detection, it will simply delegate to the according commandlet of the specific build system. If that build-system is not yet available it will be downloaded and installed automatically.\nSo `ide build` allows users to build any project without bothering about the build-system. Further specific build options can be configured per project. This makes `ide build` a universal part of every _definition of done_. Before pushing your changes, please always run the following command to verify the build:\n\n 'ide build'\n\nYou may also supply additional arguments as `ide build «args»`. This will simply delegate these arguments to the detected build command (e.g. call `mvn «args»`). cmd.build.val.args=Build arguments to be used when running a build job. -cmd.cobigen=Tool commandlet for Cobigen (code-generator). -cmd.cobigen.detail=TODO cobigen cmd.complete=Internal commandlet for bash auto-completion. cmd.complete.detail=TODO complete cmd.create=Create a new IDEasy project. diff --git a/cli/src/main/resources/nls/Help_de.properties b/cli/src/main/resources/nls/Help_de.properties index f8f049bcc..f58679fb4 100644 --- a/cli/src/main/resources/nls/Help_de.properties +++ b/cli/src/main/resources/nls/Help_de.properties @@ -9,8 +9,6 @@ cmd.az.detail=Das Azure Command-Line Interface (CLI) ist ein Werkzeug zur Erstel cmd.build=Startet einen build Prozess mit übergebenen Argumenten. cmd.build.detail=Der `build`-Befehl ist eine Abstraktion von Build-Systemen wie https://maven.apache.org/, https://gradle.org/, https://yarnpkg.com/, https://www.npmjs.com/ usw.\nEr erkennt automatisch Ihr Build-System (anhand von Dateien wie `pom.xml`, `package.json` usw.). Entsprechend dieser Erkennung delegiert er einfach an den entsprechenden Befehl des spezifischen Build-Systems. Wenn dieses Build-System noch nicht verfügbar ist, wird es automatisch heruntergeladen und installiert.\nSo ermöglicht `ide build` Benutzern, jedes Projekt zu erstellen, ohne sich um das Build-System kümmern zu müssen. Weitere spezifische Build-Optionen können pro Projekt konfiguriert werden. Dies macht `ide build` zu einem universellen Bestandteil jeder _Definition of Done_. Bevor Sie Ihre Änderungen übertragen, führen Sie bitte immer den folgenden Befehl aus, um den Build zu überprüfen:\n\n`ide build`\n\nSie können auch zusätzliche Argumente wie `ide build «args»` angeben. Diese werden einfach an den erkannten Build-Befehl weitergeleitet (z. B. Aufruf von `mvn «args»`). cmd.build.val.args=Argumente die bei dem build Prozess genutzt werden sollen. -cmd.cobigen=Werkzeug Kommando für Cobigen. -cmd.cobigen.detail=TODO DE cobigen cmd.complete=Internes Werkzeug für bash Autovervollständigung. cmd.complete.detail=TODO DE complete cmd.create=Erstellt ein neues IDEasy Projekt. diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/cobigen/CobigenTest.java b/cli/src/test/java/com/devonfw/tools/ide/tool/cobigen/CobigenTest.java deleted file mode 100644 index fd5a6df71..000000000 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/cobigen/CobigenTest.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.devonfw.tools.ide.tool.cobigen; - -import org.junit.jupiter.api.Test; - -import com.devonfw.tools.ide.context.AbstractIdeContextTest; -import com.devonfw.tools.ide.context.IdeTestContext; - -/** - * Integration test of {@link Cobigen}. - */ -public class CobigenTest extends AbstractIdeContextTest { - - private static final String COBIGEN = "cobigen"; - - private final IdeTestContext context = newContext(COBIGEN); - - /** - * Tests if {@link Cobigen} can be installed properly. - */ - @Test - public void testCobigenInstall() { - - // arrange - IdeTestContext context = newContext(COBIGEN); - - Cobigen commandlet = new Cobigen(context); - - // act - commandlet.install(); - - // assert - checkInstallation(context); - } - - /** - * Tests if {@link Cobigen} can be run properly. - */ - @Test - public void testCobigenRun() { - // arrange - - Cobigen commandlet = new Cobigen(this.context); - - // act - commandlet.run(); - - // assert - assertThat(this.context).logAtInfo().hasMessage(COBIGEN + " "); - - checkInstallation(this.context); - } - - private void checkInstallation(IdeTestContext context) { - - // install - java - assertThat(context.getSoftwarePath().resolve("java/bin/java")).exists(); - // install - mvn - assertThat(context.getSoftwarePath().resolve("mvn/bin/mvn")).exists(); - - // commandlet - cobigen - assertThat(context.getSoftwarePath().resolve("cobigen/.ide.software.version")).exists().hasContent("2021.12.006"); - assertThat(context).logAtSuccess().hasMessage("Successfully installed cobigen in version 2021.12.006"); - } -} diff --git a/cli/src/test/resources/ide-projects/cobigen/project/settings/ide.properties b/cli/src/test/resources/ide-projects/cobigen/project/settings/ide.properties deleted file mode 100644 index d9bab2a9f..000000000 --- a/cli/src/test/resources/ide-projects/cobigen/project/settings/ide.properties +++ /dev/null @@ -1,3 +0,0 @@ -JAVA_VERSION=17.0.10_7 -MAVEN_VERSION=3.9.6 -COBIGEN_VERSION=2021.12.006 \ No newline at end of file diff --git a/cli/src/test/resources/ide-projects/cobigen/project/workspaces/main/readme b/cli/src/test/resources/ide-projects/cobigen/project/workspaces/main/readme deleted file mode 100644 index e69de29bb..000000000 diff --git a/cli/src/test/resources/ide-projects/cobigen/repository/cobigen/cobigen/default/bin/cobigen b/cli/src/test/resources/ide-projects/cobigen/repository/cobigen/cobigen/default/bin/cobigen deleted file mode 100644 index 724bda873..000000000 --- a/cli/src/test/resources/ide-projects/cobigen/repository/cobigen/cobigen/default/bin/cobigen +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -echo "cobigen $*" \ No newline at end of file diff --git a/cli/src/test/resources/ide-projects/cobigen/repository/java/java/default/bin/java b/cli/src/test/resources/ide-projects/cobigen/repository/java/java/default/bin/java deleted file mode 100644 index 0aa8af9dc..000000000 --- a/cli/src/test/resources/ide-projects/cobigen/repository/java/java/default/bin/java +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -echo "java $*" \ No newline at end of file diff --git a/cli/src/test/resources/ide-projects/cobigen/repository/java/java/default/bin/java.cmd b/cli/src/test/resources/ide-projects/cobigen/repository/java/java/default/bin/java.cmd deleted file mode 100644 index bbaac3802..000000000 --- a/cli/src/test/resources/ide-projects/cobigen/repository/java/java/default/bin/java.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -echo java %* \ No newline at end of file diff --git a/cli/src/test/resources/ide-projects/cobigen/repository/mvn/mvn/default/bin/mvn b/cli/src/test/resources/ide-projects/cobigen/repository/mvn/mvn/default/bin/mvn deleted file mode 100644 index 6ff946514..000000000 --- a/cli/src/test/resources/ide-projects/cobigen/repository/mvn/mvn/default/bin/mvn +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -echo "mvn $*" \ No newline at end of file diff --git a/documentation/LICENSE.adoc b/documentation/LICENSE.adoc index eb925ae86..86de1eb37 100644 --- a/documentation/LICENSE.adoc +++ b/documentation/LICENSE.adoc @@ -34,7 +34,6 @@ The column `inclusion` indicates the way the component is included: |https://code.visualstudio.com/[VS Code] |Optional| https://github.com/Microsoft/vscode/blob/master/LICENSE.txt[MIT] (https://code.visualstudio.com/License/[Terms]) |https://github.com/devonfw/extension-pack-vscode[extension-pack-vscode] |Optional|https://github.com/devonfw/extension-pack-vscode/blob/master/LICENSE[ASL 2.0] |https://www.eclipse.org/[Eclipse] |Optional|https://www.eclipse.org/legal/epl-2.0/[EPL 2.0] -|https://github.com/devonfw/cobigen[CobiGen] |Optional|https://github.com/devonfw/cobigen/blob/master/LICENSE.txt[ASL 2.0] |https://marketplace.eclipse.org/content/tm-terminal[TM Terminal] |Optional|https://www.eclipse.org/legal/epl-2.0/[EPL 2.0] (see https://marketplace.eclipse.org/content/tm-terminal[here]) |https://github.com/iloveeclipse/anyedittools/[AnyEdit] |Optional|https://github.com/iloveeclipse/anyedittools/blob/master/LICENSE.md[EPL 1.0] |https://checkstyle.org/eclipse-cs/[EclipseCS] |Optional|https://github.com/checkstyle/eclipse-cs/blob/master/LICENSE[LGPL 2.1]