From 7af9fc54262d16b5d22b6bd557e8841a4f04720e Mon Sep 17 00:00:00 2001 From: Kian Date: Wed, 2 Oct 2024 14:49:32 +0200 Subject: [PATCH 1/7] #765: Fix typos in DoD asciidoc --- documentation/DoD.adoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/documentation/DoD.adoc b/documentation/DoD.adoc index 4a29de515..69dce4b52 100644 --- a/documentation/DoD.adoc +++ b/documentation/DoD.adoc @@ -21,11 +21,11 @@ Otherwise if a check failed (red cross) you need to click the `Details` link, re ** [ ] The build and all automated tests succeeded. If failed and you clicked on `Details` add read the logs to find the error. ** [ ] The contributors license agreement (CLA) is signed by all contributors of the PR. -** [ ] Git-Gardian did not report any security issue +** [ ] Git-Guardian did not report any security issue * [ ] The feature branch of the PR is up-to-date with the `main` branch. If you see `This branch is out-of-date with the base branch` in the PR click the `Update branch` button to fix (or manually merge with the `main` from upstream locally and push your changes). In case you see `This branch has conflicts that must be resolved` instead, you need to resolve conflicts. -Very simple conficts may be resolved in the browser on github. +Very simple conflicts may be resolved in the browser on github. But as a general recommendation you should resolve the conflicts locally with proper merge tool support and rerun tests before you push the merged changes. * [ ] You followed all link:coding-conventions.adoc[coding conventions] * [ ] You have already added the issue implemented by your PR in https://github.com/devonfw/ide/blob/master/CHANGELOG.adoc[CHANGELOG.adoc] to the next open release (see milestones or https://github.com/devonfw/IDEasy/blob/main/.mvn/maven.config[maven.config]). @@ -41,11 +41,11 @@ There are very few tools as exception to this rule like `Docker` that extend `Gl ** [ ] The tool can be configured locally inside `$IDE_HOME/conf` and not from a global location (e.g. in `$HOME`). Note: If a tool reads configuration files from the users home directory this is not given as two IDEasy projects using the same tool then would read the same config so one installation would influence the other. ** [ ] The help page displays information about the commandlet and its properties (CLI parameters) explaining how to use it properly. -There are no warnings logged in the help output (like `Cound not find key 'cmd-gcviewer' in ResourceBundle nls.Ide.properties`). +There are no warnings logged in the help output (like `Could not find key 'cmd-gcviewer' in ResourceBundle nls.Ide.properties`). Therefore add proper help texts for all supported languages https://github.com/devonfw/IDEasy/tree/main/cli/src/main/resources/nls[here]. -** [ ] The new tool is added to the table of tools in https://github.com/devonfw/ide/blob/master/documentation/LICENSE.asciidoc#license[LICENSE.asciidoc] with its according licesne. +** [ ] The new tool is added to the table of tools in https://github.com/devonfw/ide/blob/master/documentation/LICENSE.asciidoc#license[LICENSE.asciidoc] with its according license. If that license is not yet included, the full license text needs to be added. ** [ ] The new commandlet installs potential dependencies automatically (e.g. `getCommandlet(«DependentTool».class).install()` in overridden `install` method). ** [ ] The variables `«TOOL»_VERSION` and `«TOOL»_EDITION` are honored by your commandlet so if present that edition and version will be downloaded and installed (happens by default but important if you implement custom installation logic). -** [ ] The new commandlet is tested on all plattforms it is availible for. +** [ ] The new commandlet is tested on all platforms it is available for. Assuming you are using Windows, testing for Linux can be done with WSL or Virtual Box and for MacOS we have a virtual cloud instance. From e6264d814e8a6288366ec3abf7bd5694f58b2e3b Mon Sep 17 00:00:00 2001 From: KianRolf Date: Tue, 29 Oct 2024 14:17:30 +0100 Subject: [PATCH 2/7] #646: Change processmode to default --- .../java/com/devonfw/tools/ide/tool/ide/IdeToolCommandlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/ide/IdeToolCommandlet.java b/cli/src/main/java/com/devonfw/tools/ide/tool/ide/IdeToolCommandlet.java index 73649064d..4b1f5922d 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/ide/IdeToolCommandlet.java +++ b/cli/src/main/java/com/devonfw/tools/ide/tool/ide/IdeToolCommandlet.java @@ -51,7 +51,7 @@ public final void run() { @Override public void runTool(String... args) { - runTool(ProcessMode.BACKGROUND, null, args); + runTool(ProcessMode.DEFAULT, null, args); } /** From fe6e5661483a57aadd0bd9343cc8d3bbb611762b Mon Sep 17 00:00:00 2001 From: KianRolf Date: Tue, 29 Oct 2024 17:16:25 +0100 Subject: [PATCH 3/7] #646: Added env for enabling and disabling console ide logs --- .../java/com/devonfw/tools/ide/variable/IdeVariables.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/variable/IdeVariables.java b/cli/src/main/java/com/devonfw/tools/ide/variable/IdeVariables.java index 62ba32ab0..e7cf69c19 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/variable/IdeVariables.java +++ b/cli/src/main/java/com/devonfw/tools/ide/variable/IdeVariables.java @@ -31,6 +31,9 @@ public interface IdeVariables { /** {@link VariableDefinition} for list of tools to install by default. */ VariableDefinitionStringList IDE_TOOLS = new VariableDefinitionStringList("IDE_TOOLS", "DEVON_IDE_TOOLS", c -> List.of("mvn", "npm")); + /** {@link VariableDefinition} for enabling logs of ides. */ + VariableDefinitionBoolean IDE_ENABLE_LOG = new VariableDefinitionBoolean("IDE_DISABLE_LOG", null, c -> false); + /** {@link VariableDefinition} for list of IDE tools to create start scripts for. */ VariableDefinitionStringList CREATE_START_SCRIPTS = new VariableDefinitionStringList("CREATE_START_SCRIPTS", "DEVON_CREATE_START_SCRIPTS"); @@ -81,7 +84,8 @@ public interface IdeVariables { c -> Boolean.TRUE); /** A {@link Collection} with all pre-defined {@link VariableDefinition}s. */ - Collection> VARIABLES = List.of(PATH, HOME, WORKSPACE_PATH, IDE_HOME, IDE_ROOT, WORKSPACE, IDE_TOOLS, CREATE_START_SCRIPTS, + Collection> VARIABLES = List.of(PATH, HOME, WORKSPACE_PATH, IDE_HOME, IDE_ROOT, WORKSPACE, IDE_TOOLS, IDE_ENABLE_LOG, + CREATE_START_SCRIPTS, IDE_MIN_VERSION, MVN_VERSION, M2_REPO, DOCKER_EDITION, MVN_BUILD_OPTS, NPM_BUILD_OPTS, GRADLE_BUILD_OPTS, YARN_BUILD_OPTS, JASYPT_OPTS, MAVEN_ARGS, PROJECT_NAME, IDE_VARIABLE_SYNTAX_LEGACY_SUPPORT_ENABLED); From 00c0384319cc92985fa39b05ebf6792d045e9024 Mon Sep 17 00:00:00 2001 From: KianRolf Date: Wed, 30 Oct 2024 10:22:37 +0100 Subject: [PATCH 4/7] #646: Added CHANGELOG --- CHANGELOG.adoc | 2 ++ .../java/com/devonfw/tools/ide/tool/ide/IdeToolCommandlet.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 214b24775..492f02b99 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -6,6 +6,8 @@ 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/646[#646]: Add variable for intellij to disable log output + The full list of changes for this release can be found in https://github.com/devonfw/IDEasy/milestone/15?closed=1[milestone 2024.11.001]. diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/ide/IdeToolCommandlet.java b/cli/src/main/java/com/devonfw/tools/ide/tool/ide/IdeToolCommandlet.java index e5ee8914c..699e96019 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/ide/IdeToolCommandlet.java +++ b/cli/src/main/java/com/devonfw/tools/ide/tool/ide/IdeToolCommandlet.java @@ -52,7 +52,7 @@ public final void run() { @Override public void runTool(String... args) { - runTool(ProcessMode.DEFAULT, null, args); + runTool(ProcessMode.BACKGROUND, null, args); } /** From 97b1ac3605580177c07290942b36913acba011d1 Mon Sep 17 00:00:00 2001 From: KianRolf Date: Wed, 30 Oct 2024 16:09:14 +0100 Subject: [PATCH 5/7] Update cli/src/main/java/com/devonfw/tools/ide/variable/IdeVariables.java Co-authored-by: jan-vcapgemini <59438728+jan-vcapgemini@users.noreply.github.com> --- .../main/java/com/devonfw/tools/ide/variable/IdeVariables.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/variable/IdeVariables.java b/cli/src/main/java/com/devonfw/tools/ide/variable/IdeVariables.java index e7cf69c19..83b15624e 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/variable/IdeVariables.java +++ b/cli/src/main/java/com/devonfw/tools/ide/variable/IdeVariables.java @@ -32,7 +32,7 @@ public interface IdeVariables { VariableDefinitionStringList IDE_TOOLS = new VariableDefinitionStringList("IDE_TOOLS", "DEVON_IDE_TOOLS", c -> List.of("mvn", "npm")); /** {@link VariableDefinition} for enabling logs of ides. */ - VariableDefinitionBoolean IDE_ENABLE_LOG = new VariableDefinitionBoolean("IDE_DISABLE_LOG", null, c -> false); + VariableDefinitionBoolean IDE_ENABLE_LOG = new VariableDefinitionBoolean("IDE_ENABLE_LOG", null, c -> true); /** {@link VariableDefinition} for list of IDE tools to create start scripts for. */ VariableDefinitionStringList CREATE_START_SCRIPTS = new VariableDefinitionStringList("CREATE_START_SCRIPTS", "DEVON_CREATE_START_SCRIPTS"); From 81b207e6b45cdb775d8b8cf2404fb44c78a3372f Mon Sep 17 00:00:00 2001 From: KianRolf Date: Wed, 30 Oct 2024 16:09:23 +0100 Subject: [PATCH 6/7] Update CHANGELOG.adoc Co-authored-by: jan-vcapgemini <59438728+jan-vcapgemini@users.noreply.github.com> --- CHANGELOG.adoc | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 492f02b99..108d7ac71 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -8,7 +8,6 @@ Release with new features and bugfixes: * https://github.com/devonfw/IDEasy/issues/646[#646]: Add variable for intellij to disable log output - The full list of changes for this release can be found in https://github.com/devonfw/IDEasy/milestone/15?closed=1[milestone 2024.11.001]. == 2024.10.001 From ed81743894c6593df18badfb139c31f9c7f4fcdd Mon Sep 17 00:00:00 2001 From: KianRolf Date: Tue, 5 Nov 2024 14:04:12 +0100 Subject: [PATCH 7/7] #646: Rename and documentation --- .../java/com/devonfw/tools/ide/variable/IdeVariables.java | 4 ++-- documentation/variables.adoc | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/variable/IdeVariables.java b/cli/src/main/java/com/devonfw/tools/ide/variable/IdeVariables.java index 83b15624e..a830a8286 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/variable/IdeVariables.java +++ b/cli/src/main/java/com/devonfw/tools/ide/variable/IdeVariables.java @@ -32,7 +32,7 @@ public interface IdeVariables { VariableDefinitionStringList IDE_TOOLS = new VariableDefinitionStringList("IDE_TOOLS", "DEVON_IDE_TOOLS", c -> List.of("mvn", "npm")); /** {@link VariableDefinition} for enabling logs of ides. */ - VariableDefinitionBoolean IDE_ENABLE_LOG = new VariableDefinitionBoolean("IDE_ENABLE_LOG", null, c -> true); + VariableDefinitionBoolean IDE_ENABLE_CONSOLE_LOG = new VariableDefinitionBoolean("IDE_ENABLE_CONSOLE_LOG", null, c -> true); /** {@link VariableDefinition} for list of IDE tools to create start scripts for. */ VariableDefinitionStringList CREATE_START_SCRIPTS = new VariableDefinitionStringList("CREATE_START_SCRIPTS", "DEVON_CREATE_START_SCRIPTS"); @@ -84,7 +84,7 @@ public interface IdeVariables { c -> Boolean.TRUE); /** A {@link Collection} with all pre-defined {@link VariableDefinition}s. */ - Collection> VARIABLES = List.of(PATH, HOME, WORKSPACE_PATH, IDE_HOME, IDE_ROOT, WORKSPACE, IDE_TOOLS, IDE_ENABLE_LOG, + Collection> VARIABLES = List.of(PATH, HOME, WORKSPACE_PATH, IDE_HOME, IDE_ROOT, WORKSPACE, IDE_TOOLS, IDE_ENABLE_CONSOLE_LOG, CREATE_START_SCRIPTS, IDE_MIN_VERSION, MVN_VERSION, M2_REPO, DOCKER_EDITION, MVN_BUILD_OPTS, NPM_BUILD_OPTS, GRADLE_BUILD_OPTS, YARN_BUILD_OPTS, JASYPT_OPTS, MAVEN_ARGS, PROJECT_NAME, IDE_VARIABLE_SYNTAX_LEGACY_SUPPORT_ENABLED); diff --git a/documentation/variables.adoc b/documentation/variables.adoc index ef203146c..7d22a1462 100644 --- a/documentation/variables.adoc +++ b/documentation/variables.adoc @@ -18,6 +18,7 @@ Please note that we are trying to minimize any potential side-effect from `IDEas |`PATH`|`$IDE_HOME/software/java:...:$PATH`|You system path is adjusted by `ide` link:cli.adoc[command]. |`HOME_DIR`|`~`|The platform independent home directory of the current user. In some edge-cases (e.g. in cygwin) this differs from `~` to ensure a central home directory for the user on a single machine in any context or environment. |`IDE_TOOLS`|`(java mvn node npm)`|List of tools that should be installed by default on project creation. +|`IDE_ENABLE_CONSOLE_LOG`|`true`|Toggle to enable or disable whether the log output of IDEs is printed into the console. |`CREATE_START_SCRIPTS`|`(eclipse vscode)`|List of IDEs that shall be used by developers in the project and therefore start-scripts are created on setup. |*`WORKSPACE`*|`main`|The link:workspaces.adoc[workspace] you are currently in. Defaults to `main` if you are not inside a link:workspaces.adoc[workspace]. Never set this variable in any `ide.properties` file. |`WORKSPACE_PATH`|`$IDE_HOME/workspaces/$WORKSPACE`|Absolute path to current link:workspaces.adoc[workspace]. Never set this variable in any `ide.properties` file.