[ACS-5903] replace javax.json with jakarta/parsson

2025-07-24 17:32:48 +00:00 · 2023-08-31 11:00:59 +02:00
parent 746846982c
commit c18144643d
29 changed files with 51 additions and 61 deletions
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/APIUtils.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/APIUtils.java
@@ -26,8 +26,8 @@
 */
 package org.alfresco.rest.core.v0;

-import javax.json.Json;
-import javax.json.JsonReader;
+import jakarta.json.Json;
+import jakarta.json.JsonReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.format.DateTimeFormatter;
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/PreventActionsOnFrozenContentTests.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/PreventActionsOnFrozenContentTests.java
@@ -42,8 +42,8 @@ import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.AssertJUnit.assertFalse;

-import javax.json.Json;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
 import java.io.File;

 import org.alfresco.dataprep.CMISUtil;
--- a/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests.java
+++ b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests.java
@@ -7,7 +7,7 @@ import static org.hamcrest.Matchers.equalTo;
 import io.restassured.RestAssured;
 import java.io.File;

-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 import jakarta.mail.Flags;
 import jakarta.mail.MessagingException;

--- a/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithAosTests.java
+++ b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithAosTests.java
@@ -7,7 +7,7 @@ import io.restassured.http.ContentType;
 import java.util.HashMap;
 import java.util.Map;

-import javax.json.JsonObject;
+import jakarta.json.JsonObject;

 import org.alfresco.rest.core.JsonBodyGenerator;
 import org.alfresco.rest.core.RestRequest;
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -17,7 +17,6 @@
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <rest.api.explorer.branch>master</rest.api.explorer.branch>
        <httpclient-osgi-version>4.5.6</httpclient-osgi-version>
-        <org.glassfish.version>1.1.4</org.glassfish.version>
        <commons-lang3.version>3.13.0</commons-lang3.version>
        <scribejava-apis.version>8.3.3</scribejava-apis.version>
        <java.version>17</java.version>
@@ -138,13 +137,6 @@
            <artifactId>jackson-databind</artifactId>
        </dependency>

-        <!-- https://mvnrepository.com/artifact/org.glassfish/javax.json -->
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
-            <version>${org.glassfish.version}</version>
-        </dependency>
-
        <!-- swagger parser -->
        <dependency>
            <groupId>io.swagger</groupId>
@@ -184,9 +176,8 @@
       </dependency>

        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>jakarta.json</artifactId>
-            <scope>test</scope>
+            <groupId>org.eclipse.parsson</groupId>
+            <artifactId>parsson</artifactId>
        </dependency>
    </dependencies>

--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/JsonBodyGenerator.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/JsonBodyGenerator.java
@@ -25,11 +25,11 @@
 */
 package org.alfresco.rest.core;

-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonBuilderFactory;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonBuilderFactory;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/CustomModelManager.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/CustomModelManager.java
@@ -31,15 +31,10 @@ import org.alfresco.rest.core.RestWrapper;
 import org.alfresco.rest.model.RestCustomAspectModel;
 import org.alfresco.rest.model.RestCustomModel;
 import org.alfresco.rest.model.RestCustomTypeModel;
-import org.alfresco.rest.model.RestGroupsModelsCollection;
 import org.alfresco.utility.model.CustomAspectModel;
-import org.alfresco.utility.model.CustomAspectPropertiesModel;
 import org.alfresco.utility.model.CustomContentModel;
 import org.springframework.http.HttpMethod;

-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;

 /**
 * @author Bogdan Bocancea
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/CustomModelProperties.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/CustomModelProperties.java
@@ -33,8 +33,8 @@ import org.alfresco.utility.model.CustomContentModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpMethod;

-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Node.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Node.java
@@ -30,7 +30,7 @@ import static org.alfresco.rest.core.JsonBodyGenerator.arrayToJson;
 import static org.alfresco.rest.requests.RuleSettings.IS_INHERITANCE_ENABLED;
 import static org.springframework.http.HttpMethod.PUT;

-import javax.json.JsonArrayBuilder;
+import jakarta.json.JsonArrayBuilder;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Processes.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Processes.java
@@ -25,7 +25,7 @@
 */
 package org.alfresco.rest.requests;

-import javax.json.JsonArrayBuilder;
+import jakarta.json.JsonArrayBuilder;

 import org.alfresco.dataprep.CMISUtil.Priority;
 import org.alfresco.rest.core.JsonBodyGenerator;
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/SharedLinks.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/SharedLinks.java
@@ -27,7 +27,7 @@ package org.alfresco.rest.requests;

 import java.util.HashMap;

-import javax.json.JsonArrayBuilder;
+import jakarta.json.JsonArrayBuilder;

 import org.alfresco.rest.core.JsonBodyGenerator;
 import org.alfresco.rest.core.RestRequest;
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Task.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Task.java
@@ -25,8 +25,8 @@
 */
 package org.alfresco.rest.requests;

-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;

 import org.alfresco.rest.core.JsonBodyGenerator;
 import org.alfresco.rest.core.RestRequest;
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/search/SearchSQLAPI.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/search/SearchSQLAPI.java
@@ -39,8 +39,8 @@
 */
 package org.alfresco.rest.requests.search;

-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;

 import io.restassured.RestAssured;

--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/syncServiceAPI/Subscriptions.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/syncServiceAPI/Subscriptions.java
@@ -27,7 +27,7 @@ package org.alfresco.rest.requests.syncServiceAPI;

 import java.util.HashMap;

-import javax.json.JsonArrayBuilder;
+import jakarta.json.JsonArrayBuilder;

 import org.alfresco.rest.core.JsonBodyGenerator;
 import org.alfresco.rest.core.RestRequest;
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/syncServiceAPI/Sync.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/syncServiceAPI/Sync.java
@@ -27,7 +27,7 @@ package org.alfresco.rest.requests.syncServiceAPI;

 import java.util.List;

-import javax.json.JsonArrayBuilder;
+import jakarta.json.JsonArrayBuilder;

 import org.alfresco.rest.core.JsonBodyGenerator;
 import org.alfresco.rest.core.RestRequest;
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/workflowAPI/RestWorkflowAPI.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/workflowAPI/RestWorkflowAPI.java
@@ -25,7 +25,7 @@
 */
 package org.alfresco.rest.requests.workflowAPI;

-import javax.json.JsonObject;
+import jakarta.json.JsonObject;

 import org.alfresco.dataprep.CMISUtil.Priority;
 import org.alfresco.rest.core.RestWrapper;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/email/EmailTemplateTest.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/email/EmailTemplateTest.java
@@ -9,7 +9,7 @@ import java.io.InputStream;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
-import javax.json.JsonObject;
+import jakarta.json.JsonObject;

 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.core.JsonBodyGenerator;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/LinkToCategoriesTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/LinkToCategoriesTests.java
@@ -35,7 +35,7 @@ import static org.springframework.http.HttpStatus.NOT_FOUND;
 import static org.springframework.http.HttpStatus.NO_CONTENT;
 import static org.springframework.http.HttpStatus.UNPROCESSABLE_ENTITY;

-import javax.json.Json;
+import jakarta.json.Json;
 import java.util.Collections;
 import java.util.List;

--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/ListCategoriesForNodeTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/ListCategoriesForNodeTests.java
@@ -32,7 +32,7 @@ import static org.springframework.http.HttpStatus.NOT_FOUND;
 import static org.springframework.http.HttpStatus.OK;
 import static org.springframework.http.HttpStatus.UNPROCESSABLE_ENTITY;

-import javax.json.Json;
+import jakarta.json.Json;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/downloads/DownloadsTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/downloads/DownloadsTests.java
@@ -1,6 +1,6 @@
 package org.alfresco.rest.downloads;

-import javax.json.JsonObject;
+import jakarta.json.JsonObject;

 import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.rest.RestTest;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java
@@ -2,8 +2,8 @@ package org.alfresco.rest.groups;

 import java.util.UUID;

-import javax.json.Json;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;

 import org.alfresco.rest.RestTest;
 import org.alfresco.utility.RetryOperation;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesContentAndVersioningTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesContentAndVersioningTests.java
@@ -10,8 +10,8 @@ import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;

-import javax.json.Json;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesTests.java
@@ -2,8 +2,8 @@ package org.alfresco.rest.nodes;

 import static org.junit.Assert.assertEquals;

-import javax.json.Json;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;

 import org.alfresco.dataprep.CMISUtil;
 import org.alfresco.rest.RestTest;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/CreateRulesTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/CreateRulesTests.java
@@ -58,8 +58,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-import javax.json.Json;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;

 import org.alfresco.rest.model.RestActionBodyExecTemplateModel;
 import org.alfresco.rest.model.RestActionConstraintModel;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/GetSharedLinksFullTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/GetSharedLinksFullTests.java
@@ -1,7 +1,7 @@
 package org.alfresco.rest.sharedLinks;

-import javax.json.Json;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;

 import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.rest.RestTest;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/SharedLinksSanityTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/SharedLinksSanityTests.java
@@ -1,6 +1,6 @@
 package org.alfresco.rest.sharedLinks;

-import javax.json.Json;
+import jakarta.json.Json;

 import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.rest.RestTest;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/AddProcessFullTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/AddProcessFullTests.java
@@ -1,6 +1,6 @@
 package org.alfresco.rest.workflow.processes;

-import javax.json.JsonObject;
+import jakarta.json.JsonObject;

 import org.alfresco.dataprep.CMISUtil.Priority;
 import org.alfresco.rest.RestTest;
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/UpdateTaskTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/tasks/UpdateTaskTests.java
@@ -19,7 +19,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

-import javax.json.JsonObject;
+import jakarta.json.JsonObject;
 import java.util.HashMap;

 public class UpdateTaskTests extends RestTest
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,8 @@
        <dependency.jakarta-ee-activation.version>2.0.1</dependency.jakarta-ee-activation.version>
        <dependency.jakarta-ee-jms.version>3.0.0</dependency.jakarta-ee-jms.version>
        <dependency.java-ee-activation.version>1.2.0</dependency.java-ee-activation.version>
-        <dependency.jakarta-json-api.version>1.1.6</dependency.jakarta-json-api.version>
+        <dependency.jakarta-ee-json-api.version>2.1.2</dependency.jakarta-ee-json-api.version>
+        <dependency.jakarta-ee-json-impl.version>1.1.4</dependency.jakarta-ee-json-impl.version>
        <dependency.jakarta-json-path.version>2.8.0</dependency.jakarta-json-path.version>
        <dependency.json-smart.version>2.5.0</dependency.json-smart.version>
        <dependency.jakarta-rpc-api.version>1.1.4</dependency.jakarta-rpc-api.version>
@@ -266,12 +267,13 @@
            <dependency>
                <groupId>jakarta.json</groupId>
                <artifactId>jakarta.json-api</artifactId>
-                <version>${dependency.jakarta-json-api.version}</version>
+                <version>${dependency.jakarta-ee-json-api.version}</version>
            </dependency>
+
            <dependency>
-                <groupId>org.glassfish</groupId>
-                <artifactId>jakarta.json</artifactId>
-                <version>${dependency.jakarta-json-api.version}</version>
+                <groupId>org.eclipse.parsson</groupId>
+                <artifactId>parsson</artifactId>
+                <version>${dependency.jakarta-ee-json-impl.version}</version>
            </dependency>

            <dependency>
@@ -1115,6 +1117,8 @@
                                            <exclude>javax.xml.ws:jaxws-api</exclude>
                                            <exclude>javax.mail</exclude>
                                            <exclude>javax.transaction</exclude>
+                                            <exclude>*:javax.json</exclude>
+                                            <exclude>org.glassfish:jakarta.json</exclude>

 <!--                                            Enforce minimal versions of jakarta dependencies-->
                                            <exclude>jakarta.servlet:jakarta.servlet-api:(, 5.0.0)</exclude>