From c18144643d27320c9cc3f77c0d59a834fcc769a6 Mon Sep 17 00:00:00 2001 From: kcichonczyk <88378534+kcichonczyk@users.noreply.github.com> Date: Thu, 31 Aug 2023 11:00:59 +0200 Subject: [PATCH] [ACS-5903] replace javax.json with jakarta/parsson --- .../java/org/alfresco/rest/core/v0/APIUtils.java | 4 ++-- .../hold/PreventActionsOnFrozenContentTests.java | 4 ++-- .../tas/integration/IntegrationFullTests.java | 2 +- .../tas/integration/IntegrationWithAosTests.java | 2 +- packaging/tests/tas-restapi/pom.xml | 13 ++----------- .../org/alfresco/rest/core/JsonBodyGenerator.java | 10 +++++----- .../alfresco/rest/requests/CustomModelManager.java | 5 ----- .../rest/requests/CustomModelProperties.java | 4 ++-- .../main/java/org/alfresco/rest/requests/Node.java | 2 +- .../java/org/alfresco/rest/requests/Processes.java | 2 +- .../org/alfresco/rest/requests/SharedLinks.java | 2 +- .../main/java/org/alfresco/rest/requests/Task.java | 4 ++-- .../rest/requests/search/SearchSQLAPI.java | 4 ++-- .../requests/syncServiceAPI/Subscriptions.java | 2 +- .../rest/requests/syncServiceAPI/Sync.java | 2 +- .../rest/requests/workflowAPI/RestWorkflowAPI.java | 2 +- .../rest/actions/email/EmailTemplateTest.java | 2 +- .../rest/categories/LinkToCategoriesTests.java | 2 +- .../categories/ListCategoriesForNodeTests.java | 2 +- .../alfresco/rest/downloads/DownloadsTests.java | 2 +- .../java/org/alfresco/rest/groups/GroupsTests.java | 4 ++-- .../rest/nodes/NodesContentAndVersioningTests.java | 4 ++-- .../java/org/alfresco/rest/nodes/NodesTests.java | 4 ++-- .../org/alfresco/rest/rules/CreateRulesTests.java | 4 ++-- .../rest/sharedLinks/GetSharedLinksFullTests.java | 4 ++-- .../rest/sharedLinks/SharedLinksSanityTests.java | 2 +- .../workflow/processes/AddProcessFullTests.java | 2 +- .../rest/workflow/tasks/UpdateTaskTests.java | 2 +- pom.xml | 14 +++++++++----- 29 files changed, 51 insertions(+), 61 deletions(-) diff --git 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 index b4b8a6b6cd..e070267564 100644 --- 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; diff --git 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 index 6a345b820c..95a493b8ad 100644 --- 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; diff --git 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 index 8501e95257..a887da9d81 100644 --- 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; diff --git 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 index c91e948b28..3a3489eb18 100644 --- 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; diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 47fda377ef..1e5a5e7bfa 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -17,7 +17,6 @@ UTF-8 master 4.5.6 - 1.1.4 3.13.0 8.3.3 17 @@ -138,13 +137,6 @@ jackson-databind - - - org.glassfish - javax.json - ${org.glassfish.version} - - io.swagger @@ -184,9 +176,8 @@ - org.glassfish - jakarta.json - test + org.eclipse.parsson + parsson diff --git 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 index 1ed7cbc9f2..6f6981a5c7 100644 --- 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; diff --git 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 index 7bb4545d30..51bf5c61c7 100644 --- 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 diff --git 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 index d2a7ee496f..58ad7ede77 100644 --- 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; diff --git 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 index 1d7f0596b8..e41da3a530 100644 --- 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; diff --git 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 index 5a36f055ae..bfcaf80407 100644 --- 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; diff --git 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 index 7f3d1f0fca..1d65de5260 100644 --- 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; diff --git 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 index 83f4aca7b0..6709877b3a 100644 --- 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; diff --git 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 index 883757906d..69fac7de9f 100644 --- 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; diff --git 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 index d659345b8a..7271e4e338 100644 --- 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; diff --git 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 index e8ecd607b7..b8e66bfcb3 100644 --- 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; diff --git 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 index 9fc0f8716d..943c638eba 100644 --- 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; diff --git 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 index cb4546cb86..e72bdda1dd 100644 --- 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; diff --git 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 index a8c4468764..2a24803ceb 100644 --- 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; diff --git 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 index b8de59d338..45b2c76b0f 100644 --- 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; diff --git 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 index 9021cd2d50..ef9a874760 100644 --- 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; diff --git 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 index 1ea3b53166..80442c84cb 100644 --- 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; diff --git 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 index 7804743923..d7f7c30e5b 100644 --- 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; diff --git 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 index d6558b1e87..0bbea9fe3c 100644 --- 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; diff --git 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 index 8b195e3ebd..b257b577d9 100644 --- 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; diff --git 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 index c2e3627a61..5adbd85d54 100644 --- 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; diff --git 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 index 2dc82acb63..3b53be8556 100644 --- 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; diff --git 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 index c1eb6b24a0..10f51b3eec 100644 --- 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; diff --git 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 index 968f786bc6..06c540e755 100644 --- 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 diff --git a/pom.xml b/pom.xml index 236bdba003..a14d3c44d3 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,8 @@ 2.0.1 3.0.0 1.2.0 - 1.1.6 + 2.1.2 + 1.1.4 2.8.0 2.5.0 1.1.4 @@ -266,12 +267,13 @@ jakarta.json jakarta.json-api - ${dependency.jakarta-json-api.version} + ${dependency.jakarta-ee-json-api.version} + - org.glassfish - jakarta.json - ${dependency.jakarta-json-api.version} + org.eclipse.parsson + parsson + ${dependency.jakarta-ee-json-impl.version} @@ -1115,6 +1117,8 @@ javax.xml.ws:jaxws-api javax.mail javax.transaction + *:javax.json + org.glassfish:jakarta.json jakarta.servlet:jakarta.servlet-api:(, 5.0.0)