You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2025/03/28 13:31:02 UTC

(sling-org-apache-sling-junit-teleporter) branch master updated: SLING-12723 - Migrate JUnit teleporter to Jakarta JSON (#10)

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-teleporter.git


The following commit(s) were added to refs/heads/master by this push:
     new 6553218  SLING-12723 - Migrate JUnit teleporter to Jakarta JSON (#10)
6553218 is described below

commit 6553218e1a29b0fe26702eb1e3936f153a6a21ee
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Mar 28 14:30:57 2025 +0100

    SLING-12723 - Migrate JUnit teleporter to Jakarta JSON (#10)
---
 pom.xml                                              | 20 ++++++++++++--------
 .../teleporter/client/TeleporterHttpClient.java      | 16 ++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index a16d82e..ee931d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,17 +88,21 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.junit.core</artifactId>
-      <version>1.0.30</version>
+      <version>1.1.7-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.commons.johnzon</artifactId>
-      <version>1.2.0</version>
-      <!-- this dependency is necessary at test execution time from dependent modules 
-           and must therefore be available transitively 
-           (https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Dependency_Scope) -->
-      <scope>runtime</scope> 
+        <groupId>jakarta.json</groupId>
+        <artifactId>jakarta.json-api</artifactId>
+        <version>2.0.2</version>
+        <scope>provided</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.johnzon</groupId>
+        <artifactId>johnzon-core</artifactId>
+        <version>1.2.21</version>
+        <classifier>jakarta</classifier>
+        <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
diff --git a/src/main/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClient.java b/src/main/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClient.java
index 61a43b6..f8e5eab 100644
--- a/src/main/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClient.java
+++ b/src/main/java/org/apache/sling/testing/teleporter/client/TeleporterHttpClient.java
@@ -34,14 +34,14 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonString;
-import javax.json.JsonValue;
-import javax.json.JsonValue.ValueType;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonValue.ValueType;
 
 import org.apache.commons.io.IOUtils;
 import org.junit.runner.Result;