#685: update dependencies, added missing deps to LICENSE.adoc, doc re…

…work, jakarta migration (#686)

cli/pom.xml

@@ -19,6 +19,7 @@
     <assembly.maven.plugin.version>3.7.1</assembly.maven.plugin.version>
     <jline.version>3.24.1</jline.version>
     <jansi.version>2.4.0</jansi.version>
+    <jackson.version>2.18.0</jackson.version>
   </properties>
 
   <dependencies>
@@ -30,29 +31,29 @@
     </dependency>
     <!-- JSON and XML support -->
     <dependency>
-      <groupId>javax.json</groupId>
-      <artifactId>javax.json-api</artifactId>
-      <version>1.1.4</version>
+      <groupId>jakarta.json</groupId>
+      <artifactId>jakarta.json-api</artifactId>
+      <version>2.1.3</version>
     </dependency>
     <dependency>
-      <groupId>org.glassfish</groupId>
-      <artifactId>javax.json</artifactId>
-      <version>1.1.4</version>
+      <groupId>org.eclipse.parsson</groupId>
+      <artifactId>parsson</artifactId>
+      <version>1.1.7</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.14.1</version>
+      <version>${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
-      <version>2.14.1</version>
+      <version>${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-xml</artifactId>
-      <version>2.14.1</version>
+      <version>${jackson.version}</version>
     </dependency>
     <!-- Logging (only for URL-Updaters) -->
     <dependency>

cli/src/main/java/com/devonfw/tools/ide/merge/JsonMerger.java

@@ -8,18 +8,18 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
-import javax.json.JsonString;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
-import javax.json.JsonWriter;
-import javax.json.JsonWriterFactory;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonString;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonWriter;
+import jakarta.json.JsonWriterFactory;
+import jakarta.json.stream.JsonGenerator;
 
 import com.devonfw.tools.ide.context.IdeContext;
 import com.devonfw.tools.ide.environment.EnvironmentVariables;

cli/src/main/java/com/devonfw/tools/ide/repo/CustomToolRepositoryImpl.java

@@ -14,14 +14,14 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonString;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
-import javax.json.JsonValue.ValueType;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonString;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonValue.ValueType;
 
 import com.devonfw.tools.ide.context.IdeContext;
 import com.devonfw.tools.ide.url.model.file.UrlDownloadFileMetadata;
@@ -149,7 +149,7 @@ public Collection<CustomTool> getTools() {
 
   @Override
   public Collection<ToolDependency> findDependencies(String tool, String edition, VersionIdentifier version) {
-    
+
     return Collections.emptyList();
   }
 

cli/src/test/java/com/devonfw/tools/ide/merge/DirectoryMergerTest.java

@@ -45,10 +45,9 @@ public class DirectoryMergerTest extends AbstractIdeContextTest {
    * @throws Exception on error.
    */
   @Test
-  // arrange
   public void testConfigurator(@TempDir Path workspaceDir) throws Exception {
 
-    // act
+    // arrange
     IdeContext context = newContext(PROJECT_BASIC, null, false);
     DirectoryMerger merger = context.getWorkspaceMerger();
     Path templates = Path.of("src/test/resources/templates");
@@ -57,6 +56,8 @@ public void testConfigurator(@TempDir Path workspaceDir) throws Exception {
     Path namePath = workspaceDir.resolve(".name");
     // to check overwrite for Text files
     Files.createFile(namePath);
+
+    // act
     merger.merge(setup, update, context.getVariables(), workspaceDir);
 
     // assert
@@ -66,7 +67,6 @@ public void testConfigurator(@TempDir Path workspaceDir) throws Exception {
     Path jsonFolder = workspaceDir.resolve("json");
     assertThat(jsonFolder).isDirectory();
     assertThat(jsonFolder.resolve("settings.json")).hasContent("""
-
         {
             "java.home": "${IDE_HOME}/software/java",
             "tslint.autoFixOnSave": true,
@@ -82,7 +82,6 @@ public void testConfigurator(@TempDir Path workspaceDir) throws Exception {
         }
         """.replace("${IDE_HOME}", IDE_HOME));
     assertThat(jsonFolder.resolve("update.json")).hasContent("""
-
         {
             "key": "value"
         }

documentation/DoD.adoc

@@ -17,7 +17,7 @@ See also https://github.com/devonfw/IDEasy/blob/main/documentation/IDEasy-contri
 ** [ ] Milestones are typically assigned by PO (Jörg) but have to be set before issues and PRs get closed.
 In case your issue is only addressed by a change in `ide-mirrors`/`ide-urls` or in `ide-settings` repository, please already assign the according milestone (switch to `closed` tab under `Milestone`).
 * [ ] All checks have passed.
-Otherwise if a check failed (red cross) you need to click the `Details` link, read the logs and fix the problem.
+Otherwise, if a check failed (red cross) you need to click the `Details` link, read the logs and fix the problem.
 ** [ ] 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.

documentation/IDEasy-usage.adoc

@@ -34,4 +34,4 @@ include::updates.adoc[leveloffset=3]
 
 include::workspaces.adoc[leveloffset=3]
 
-include::projects.adoc[leveloffset=3]
+include::repository.adoc[leveloffset=3]