From 303f4e19cae93026f0d8d8a6d9ed6b2c69a79eab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= <joerg.hohwiller@capgemini.com>
Date: Tue, 14 Jan 2025 14:59:56 +0100
Subject: [PATCH 1/5] devonfw/IDEasy#582: reworked all IntelliJ XML templates

---
 intellij/workspace/update/.idea/encodings.xml |   4 +-
 .../update/.idea/mavenProjectSettings.xml     |  10 +-
 intellij/workspace/update/.idea/misc.xml      |   4 +-
 intellij/workspace/update/.idea/workspace.xml |  58 ++--
 .../.intellij/config/inspection/Default.xml   |   4 +-
 .../config/options/code.style.schemes.xml     |   6 +-
 .../.intellij/config/options/ide.general.xml  |   8 +-
 .../.intellij/config/options/jdk.table.xml    | 306 +++++++++---------
 .../.intellij/config/options/nodejs.xml       |   6 +-
 .../.intellij/config/options/path.macros.xml  |   6 +-
 .../config/options/trusted-paths.xml          |  18 +-
 11 files changed, 215 insertions(+), 215 deletions(-)

diff --git a/intellij/workspace/update/.idea/encodings.xml b/intellij/workspace/update/.idea/encodings.xml
index 6d4b71d..0d20a2e 100644
--- a/intellij/workspace/update/.idea/encodings.xml
+++ b/intellij/workspace/update/.idea/encodings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:merge="https://github.com/devonfw/IDEasy/merge" merge:strategy="combine" version="4">
-  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8" merge:id="@name" />
+<project version="4">
+  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8"/>
 </project>
\ No newline at end of file
diff --git a/intellij/workspace/update/.idea/mavenProjectSettings.xml b/intellij/workspace/update/.idea/mavenProjectSettings.xml
index 4c01cc4..ceb4f3b 100644
--- a/intellij/workspace/update/.idea/mavenProjectSettings.xml
+++ b/intellij/workspace/update/.idea/mavenProjectSettings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:merge="https://github.com/devonfw/IDEasy/merge" merge:strategy="override" version="4">
-  <component name="MavenProjectSettings" merge:id="@name">
-    <option name="testRunningSettings" merge:id="@name">
-      <MavenTestRunningSettings  merge:id="name()">
-        <option name="passArgLine" value="true" merge:id="@name" />
+<project version="4">
+  <component name="MavenProjectSettings">
+    <option name="testRunningSettings">
+      <MavenTestRunningSettings>
+        <option name="passArgLine" value="true"/>
       </MavenTestRunningSettings>
     </option>
   </component>
diff --git a/intellij/workspace/update/.idea/misc.xml b/intellij/workspace/update/.idea/misc.xml
index 80c98f5..1b308ff 100644
--- a/intellij/workspace/update/.idea/misc.xml
+++ b/intellij/workspace/update/.idea/misc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:merge="https://github.com/devonfw/IDEasy/merge" merge:strategy="combine" version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="Java" project-jdk-type="JavaSDK" merge:id="@name" />
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="Java" project-jdk-type="JavaSDK"/>
 </project>
diff --git a/intellij/workspace/update/.idea/workspace.xml b/intellij/workspace/update/.idea/workspace.xml
index 9c7d5b7..5cff53b 100644
--- a/intellij/workspace/update/.idea/workspace.xml
+++ b/intellij/workspace/update/.idea/workspace.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:merge="https://github.com/devonfw/IDEasy/merge" merge:strategy="combine" version="4">
-  <component name="AutoImportSettings" merge:id="@name">
-    <option name="autoReloadType" value="SELECTIVE" merge:id="@name" />
+<project xmlns:merge="https://github.com/devonfw/IDEasy/merge" version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE"/>
   </component>
-  <component name="FormatOnSaveOptions" merge:id="@name">
-    <option name="myRunOnSave" value="true" merge:id="@name" />
+  <component name="FormatOnSaveOptions">
+    <option name="myRunOnSave" value="true"/>
   </component>
-  <component name="Git.Settings" merge:id="@name">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" merge:id="@name" />
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$"/>
   </component>
-  <component name="MavenImportPreferences" merge:id="@name">
-    <option name="generalSettings" merge:id="@name" merge:strategy="override">
-      <MavenGeneralSettings  merge:id="name()">
-        <option name="mavenHome" value="$[IDE_HOME]/software/mvn" merge:id="@name" />
-        <option name="threads" value="7" />
-        <option name="useMavenConfig" value="true" />
-        <option name="userSettingsFile" value="$[IDE_HOME]/conf/mvn/settings.xml" />
-        <option name="localRepository" value="$[IDE_HOME]/conf/mvn/repository" />
+  <component name="MavenImportPreferences">
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="mavenHome" value="$[IDE_HOME]/software/mvn"/>
+        <option name="threads" value="7"/>
+        <option name="useMavenConfig" value="true"/>
+        <option name="userSettingsFile" value="$[IDE_HOME]/conf/mvn/settings.xml"/>
+        <option name="localRepository" value="$[IDE_HOME]/conf/mvn/repository"/>
       </MavenGeneralSettings>
     </option>
   </component>
-  <component name="MavenRunner" merge:id="@name">
-    <option name="jreName" value="Java" />
-    <option name="skipTests" value="true" />
-    <option name="vmOptions" value="-Xmx8G" />
+  <component name="MavenRunner">
+    <option name="jreName" value="Java"/>
+    <option name="skipTests" value="true"/>
+    <option name="vmOptions" value="-Xmx8G"/>
   </component>
-  <component name="OptimizeOnSaveOptions" merge:id="@name">
-    <option name="myRunOnSave" value="true" />
+  <component name="OptimizeOnSaveOptions">
+    <option name="myRunOnSave" value="true"/>
   </component>
-  <component name="RunManager" merge:id="@name">
-    <configuration default="true" type="JUnit" factoryName="JUnit" merge:id="name">
-      <shortenClasspath name="ARGS_FILE" />
-      <option name="METHOD_NAME" value="" />
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
+  <component name="RunManager">
+    <configuration default="true" type="JUnit" factoryName="JUnit" merge:id="name()">
+      <shortenClasspath name="ARGS_FILE"/>
+      <option name="METHOD_NAME" value=""/>
+      <option name="TEST_OBJECT" value="class"/>
+      <method v="2" merge:id="@v">
+        <option name="Make" enabled="true"/>
       </method>
     </configuration>
   </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" merge:id="@name" />
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true"/>
 </project>
diff --git a/intellij/workspace/update/.intellij/config/inspection/Default.xml b/intellij/workspace/update/.intellij/config/inspection/Default.xml
index 0f8caca..2b5e388 100644
--- a/intellij/workspace/update/.intellij/config/inspection/Default.xml
+++ b/intellij/workspace/update/.intellij/config/inspection/Default.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profile version="1.0" xmlns:merge="https://github.com/devonfw/IDEasy/merge" merge:strategy="COMBINE">
-  <option name="myName" value="Default" merge:id="@name"/>
+<profile version="1.0" xmlns:merge="https://github.com/devonfw/IDEasy/merge">
+  <option name="myName" value="Default"/>
   <inspection_tool class="AmbiguousFieldAccess" enabled="true" enabled_by_default="true" level="WARNING" merge:id="@class"/>
   <inspection_tool class="MissingJavadoc" enabled="true" enabled_by_default="true" level="WARNING"/>
   <inspection_tool class="MissingOverrideAnnotation" editorAttributes="WARNING_ATTRIBUTES" enabled="true" enabled_by_default="true" level="WARNING"/>
diff --git a/intellij/workspace/update/.intellij/config/options/code.style.schemes.xml b/intellij/workspace/update/.intellij/config/options/code.style.schemes.xml
index c461b94..8feda6d 100644
--- a/intellij/workspace/update/.intellij/config/options/code.style.schemes.xml
+++ b/intellij/workspace/update/.intellij/config/options/code.style.schemes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<application xmlns:merge="https://github.com/devonfw/IDEasy/merge" merge:strategy="combine" version="4">
-  <component name="CodeStyleSchemeSettings" merge:id="@name">
-    <option name="CURRENT_SCHEME_NAME" value="Default" merge:id="@name" />
+<application xmlns:merge="https://github.com/devonfw/IDEasy/merge" version="4">
+  <component name="CodeStyleSchemeSettings">
+    <option name="CURRENT_SCHEME_NAME" value="Default"/>
   </component>
 </application>
\ No newline at end of file
diff --git a/intellij/workspace/update/.intellij/config/options/ide.general.xml b/intellij/workspace/update/.intellij/config/options/ide.general.xml
index 02e0093..f65146a 100644
--- a/intellij/workspace/update/.intellij/config/options/ide.general.xml
+++ b/intellij/workspace/update/.intellij/config/options/ide.general.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<application xmlns:merge="https://github.com/devonfw/IDEasy/merge" merge:strategy="combine" version="4">
-  <component name="GeneralSettings" merge:id="@name">
-    <option name="showTipsOnStartup" value="false" merge:id="@name"/>
-    <option name="confirmOpenNewProject2" value="0" />
+<application xmlns:merge="https://github.com/devonfw/IDEasy/merge" version="4">
+  <component name="GeneralSettings">
+    <option name="showTipsOnStartup" value="false"/>
+    <option name="confirmOpenNewProject2" value="0"/>
   </component>
 </application>
\ No newline at end of file
diff --git a/intellij/workspace/update/.intellij/config/options/jdk.table.xml b/intellij/workspace/update/.intellij/config/options/jdk.table.xml
index 4031283..013e188 100644
--- a/intellij/workspace/update/.intellij/config/options/jdk.table.xml
+++ b/intellij/workspace/update/.intellij/config/options/jdk.table.xml
@@ -1,172 +1,172 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<application xmlns:merge="https://github.com/devonfw/IDEasy/merge" merge:strategy="override">
-  <component name="ProjectJdkTable" merge:id="@name">
-    <jdk version="2" merge:id="@version">
-      <name value="Java" merge:id="@value"/>
-      <type value="JavaSDK" merge:id="@value"/>
-      <version value="OpenJDK $[JAVA_VERSION]" merge:id="@value"/>
-      <homePath value="$[IDE_HOME]/software/java" merge:id="@value"/>
+<application xmlns:merge="https://github.com/devonfw/IDEasy/merge">
+  <component name="ProjectJdkTable" merge:id="./jdk/name[@value='Java']/.." merge:strategy="override">
+    <jdk version="2">
+      <name value="Java"/>
+      <type value="JavaSDK"/>
+      <version value="OpenJDK $[JAVA_VERSION]"/>
+      <homePath value="$[IDE_HOME]/software/java"/>
       <roots>
         <annotationsPath>
-          <root type="composite" merge:id="@type">
-            <root url="jar://$APPLICATION_HOME_DIR$/plugins/java/lib/resources/jdkAnnotations.jar!/" type="simple" />
+          <root type="composite">
+            <root url="jar://$APPLICATION_HOME_DIR$/plugins/java/lib/resources/jdkAnnotations.jar!/" type="simple"/>
           </root>
         </annotationsPath>
         <classPath>
           <root type="composite">
-            <root url="jrt://$[IDE_HOME]/software/java!/java.base" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.compiler" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.datatransfer" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.desktop" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.instrument" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.logging" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.management" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.management.rmi" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.naming" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.net.http" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.prefs" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.rmi" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.scripting" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.se" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.security.jgss" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.security.sasl" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.smartcardio" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.sql" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.sql.rowset" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.transaction.xa" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.xml" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/java.xml.crypto" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.accessibility" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.attach" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.charsets" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.compiler" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.crypto.cryptoki" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.crypto.ec" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.crypto.mscapi" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.dynalink" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.editpad" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.hotspot.agent" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.httpserver" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.incubator.foreign" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.incubator.vector" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.internal.ed" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.internal.jvmstat" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.internal.le" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.internal.opt" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.internal.vm.ci" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.internal.vm.compiler" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.internal.vm.compiler.management" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jartool" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.javadoc" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jcmd" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jconsole" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jdeps" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jdi" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jdwp.agent" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jfr" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jlink" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jpackage" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jshell" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jsobject" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jstatd" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.localedata" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.management" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.management.agent" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.management.jfr" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.naming.dns" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.naming.rmi" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.net" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.nio.mapmode" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.random" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.sctp" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.security.auth" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.security.jgss" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.unsupported" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.unsupported.desktop" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.xml.dom" type="simple" />
-            <root url="jrt://$[IDE_HOME]/software/java!/jdk.zipfs" type="simple" />
+            <root url="jrt://$[IDE_HOME]/software/java!/java.base" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.compiler" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.datatransfer" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.desktop" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.instrument" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.logging" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.management" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.management.rmi" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.naming" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.net.http" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.prefs" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.rmi" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.scripting" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.se" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.security.jgss" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.security.sasl" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.smartcardio" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.sql" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.sql.rowset" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.transaction.xa" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.xml" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/java.xml.crypto" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.accessibility" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.attach" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.charsets" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.compiler" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.crypto.cryptoki" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.crypto.ec" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.crypto.mscapi" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.dynalink" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.editpad" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.hotspot.agent" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.httpserver" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.incubator.foreign" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.incubator.vector" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.internal.ed" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.internal.jvmstat" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.internal.le" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.internal.opt" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.internal.vm.ci" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.internal.vm.compiler" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.internal.vm.compiler.management" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jartool" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.javadoc" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jcmd" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jconsole" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jdeps" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jdi" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jdwp.agent" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jfr" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jlink" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jpackage" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jshell" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jsobject" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.jstatd" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.localedata" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.management" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.management.agent" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.management.jfr" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.naming.dns" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.naming.rmi" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.net" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.nio.mapmode" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.random" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.sctp" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.security.auth" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.security.jgss" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.unsupported" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.unsupported.desktop" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.xml.dom" type="simple"/>
+            <root url="jrt://$[IDE_HOME]/software/java!/jdk.zipfs" type="simple"/>
           </root>
         </classPath>
         <javadocPath>
-          <root type="composite" />
+          <root type="composite"/>
         </javadocPath>
         <sourcePath>
           <root type="composite">
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.se" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jdi" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jfr" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.net" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.rmi" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.sql" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.xml" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jcmd" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.sctp" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.base" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jdeps" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jlink" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.zipfs" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.prefs" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.attach" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jshell" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jstatd" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.random" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.naming" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.editpad" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jartool" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.javadoc" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.xml.dom" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.desktop" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.logging" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.charsets" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.compiler" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.dynalink" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jconsole" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jpackage" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jsobject" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.compiler" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.net.http" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.crypto.ec" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.scripting" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.httpserver" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jdwp.agent" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.localedata" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.management" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.naming.dns" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.naming.rmi" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.instrument" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.management" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.sql.rowset" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.xml.crypto" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.internal.ed" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.internal.le" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.nio.mapmode" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.unsupported" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.smartcardio" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.internal.opt" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.datatransfer" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.accessibility" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.crypto.mscapi" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.hotspot.agent" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.security.auth" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.security.jgss" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.security.jgss" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.security.sasl" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.internal.vm.ci" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.management.jfr" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.management.rmi" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.transaction.xa" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.crypto.cryptoki" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.incubator.vector" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.internal.jvmstat" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.management.agent" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.incubator.foreign" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.unsupported.desktop" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.internal.vm.compiler" type="simple" />
-            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.internal.vm.compiler.management" type="simple" />
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.se" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jdi" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jfr" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.net" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.rmi" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.sql" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.xml" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jcmd" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.sctp" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.base" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jdeps" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jlink" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.zipfs" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.prefs" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.attach" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jshell" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jstatd" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.random" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.naming" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.editpad" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jartool" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.javadoc" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.xml.dom" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.desktop" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.logging" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.charsets" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.compiler" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.dynalink" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jconsole" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jpackage" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jsobject" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.compiler" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.net.http" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.crypto.ec" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.scripting" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.httpserver" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.jdwp.agent" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.localedata" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.management" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.naming.dns" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.naming.rmi" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.instrument" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.management" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.sql.rowset" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.xml.crypto" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.internal.ed" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.internal.le" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.nio.mapmode" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.unsupported" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.smartcardio" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.internal.opt" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.datatransfer" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.accessibility" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.crypto.mscapi" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.hotspot.agent" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.security.auth" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.security.jgss" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.security.jgss" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.security.sasl" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.internal.vm.ci" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.management.jfr" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.management.rmi" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/java.transaction.xa" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.crypto.cryptoki" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.incubator.vector" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.internal.jvmstat" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.management.agent" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.incubator.foreign" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.unsupported.desktop" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.internal.vm.compiler" type="simple"/>
+            <root url="jar://$[IDE_HOME]/software/java/lib/src.zip!/jdk.internal.vm.compiler.management" type="simple"/>
           </root>
         </sourcePath>
       </roots>
-      <additional />
+      <additional/>
     </jdk>
   </component>
 </application>
diff --git a/intellij/workspace/update/.intellij/config/options/nodejs.xml b/intellij/workspace/update/.intellij/config/options/nodejs.xml
index f901bfc..aa17122 100644
--- a/intellij/workspace/update/.intellij/config/options/nodejs.xml
+++ b/intellij/workspace/update/.intellij/config/options/nodejs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<application xmlns:merge="https://github.com/devonfw/IDEasy/merge" merge:strategy="combine">
-  <component name="NodeJsLocalInterpreterManager" merge:id="@name">
+<application xmlns:merge="https://github.com/devonfw/IDEasy/merge">
+  <component name="NodeJsLocalInterpreterManager">
     <!-- ATTENTION: Will only work on windows so far -->
-    <local-interpreter path="$[IDE_HOME]/software/node/node.exe" merge:id="@path"/>
+    <local-interpreter path="$[IDE_HOME]/software/node/node.exe" merge:id="name()"/>
   </component>
 </application>
\ No newline at end of file
diff --git a/intellij/workspace/update/.intellij/config/options/path.macros.xml b/intellij/workspace/update/.intellij/config/options/path.macros.xml
index 448878b..1e981b2 100644
--- a/intellij/workspace/update/.intellij/config/options/path.macros.xml
+++ b/intellij/workspace/update/.intellij/config/options/path.macros.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<application xmlns:merge="https://github.com/devonfw/IDEasy/merge" merge:strategy="combine">
-  <component name="PathMacrosImpl" merge:id="@name">
-    <macro name="MAVEN_REPOSITORY" value="${M2_REPO}" merge:id="@name" />
+<application>
+  <component name="PathMacrosImpl">
+    <macro name="MAVEN_REPOSITORY" value="$[M2_REPO]"/>
   </component>
 </application>
\ No newline at end of file
diff --git a/intellij/workspace/update/.intellij/config/options/trusted-paths.xml b/intellij/workspace/update/.intellij/config/options/trusted-paths.xml
index 88c16e7..36bc53a 100644
--- a/intellij/workspace/update/.intellij/config/options/trusted-paths.xml
+++ b/intellij/workspace/update/.intellij/config/options/trusted-paths.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<application xmlns:merge="https://github.com/devonfw/IDEasy/merge" merge:strategy="override" version="4">
-  <component name="Trusted.Paths" merge:id="@name">
-    <option name="TRUSTED_PROJECT_PATHS" merge:id="@name">
-      <map merge:id="name()">
-        <entry key="$[WORKSPACE_PATH]" value="true" merge:id="@key" />
+<application xmlns:merge="https://github.com/devonfw/IDEasy/merge" version="4">
+  <component name="Trusted.Paths" >
+    <option name="TRUSTED_PROJECT_PATHS">
+      <map>
+        <entry key="$[WORKSPACE_PATH]" value="true" merge:id="@key"/>
       </map>
     </option>
   </component>
-  <component name="Trusted.Paths.Settings" merge:id="@name">
-    <option name="TRUSTED_PATHS" merge:id="@name">
-      <list merge:id="name()">
-        <option value="$[WORKSPACE_PATH]" merge:id="@value" />
+  <component name="Trusted.Paths.Settings">
+    <option name="TRUSTED_PATHS">
+      <list>
+        <option value="$[WORKSPACE_PATH]" merge:id="@value"/>
       </list>
     </option>
   </component>

From 657b0d2743a2e4b6bc6d3ec364bd3f77a91ef210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= <hohwille@users.noreply.github.com>
Date: Tue, 21 Jan 2025 10:22:53 +0100
Subject: [PATCH 2/5] Update encodings.xml: keep namespace

---
 intellij/workspace/update/.idea/encodings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/intellij/workspace/update/.idea/encodings.xml b/intellij/workspace/update/.idea/encodings.xml
index 0d20a2e..a66a8f6 100644
--- a/intellij/workspace/update/.idea/encodings.xml
+++ b/intellij/workspace/update/.idea/encodings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
+<project version="4" xmlns:merge="https://github.com/devonfw/IDEasy/merge">
   <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8"/>
-</project>
\ No newline at end of file
+</project>

From 16e287d1e419b7a3cd2d7b79c4593fa3def655ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= <hohwille@users.noreply.github.com>
Date: Tue, 21 Jan 2025 10:23:22 +0100
Subject: [PATCH 3/5] Update mavenProjectSettings.xml: keep namespace

---
 intellij/workspace/update/.idea/mavenProjectSettings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/intellij/workspace/update/.idea/mavenProjectSettings.xml b/intellij/workspace/update/.idea/mavenProjectSettings.xml
index ceb4f3b..b1d1640 100644
--- a/intellij/workspace/update/.idea/mavenProjectSettings.xml
+++ b/intellij/workspace/update/.idea/mavenProjectSettings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
+<project version="4" xmlns:merge="https://github.com/devonfw/IDEasy/merge">
   <component name="MavenProjectSettings">
     <option name="testRunningSettings">
       <MavenTestRunningSettings>

From 018cd14c7feab02b291227799df37e62b5be98d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= <hohwille@users.noreply.github.com>
Date: Tue, 21 Jan 2025 10:24:00 +0100
Subject: [PATCH 4/5] Update misc.xml: keep namespace

---
 intellij/workspace/update/.idea/misc.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/intellij/workspace/update/.idea/misc.xml b/intellij/workspace/update/.idea/misc.xml
index 1b308ff..54ba364 100644
--- a/intellij/workspace/update/.idea/misc.xml
+++ b/intellij/workspace/update/.idea/misc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
+<project version="4" xmlns:merge="https://github.com/devonfw/IDEasy/merge">
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="Java" project-jdk-type="JavaSDK"/>
 </project>

From 1bdd5157df5dc28d476bb363b7a07a56a463553b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= <hohwille@users.noreply.github.com>
Date: Tue, 21 Jan 2025 10:24:44 +0100
Subject: [PATCH 5/5] Update path.macros.xml: keep namespace

---
 .../workspace/update/.intellij/config/options/path.macros.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/intellij/workspace/update/.intellij/config/options/path.macros.xml b/intellij/workspace/update/.intellij/config/options/path.macros.xml
index 1e981b2..51713ce 100644
--- a/intellij/workspace/update/.intellij/config/options/path.macros.xml
+++ b/intellij/workspace/update/.intellij/config/options/path.macros.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<application>
+<application xmlns:merge="https://github.com/devonfw/IDEasy/merge">
   <component name="PathMacrosImpl">
     <macro name="MAVEN_REPOSITORY" value="$[M2_REPO]"/>
   </component>
-</application>
\ No newline at end of file
+</application>