(sling-org-apache-sling-graphql-core) branch master updated: SLING-12199 : Migrate to jakarta.json

[cziegeler]

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

cziegeler pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-graphql-core.git


The following commit(s) were added to refs/heads/master by this push:
     new f219b03  SLING-12199 : Migrate to jakarta.json
f219b03 is described below

commit f219b0315a0476a35e4c19781ac8bce29df1a21b
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Wed Dec 13 06:58:50 2023 +0100

    SLING-12199 : Migrate to jakarta.json
---
 pom.xml                                                             | 4 ++--
 .../apache/sling/graphql/core/scripting/GraphQLScriptEngine.java    | 6 +++---
 .../java/org/apache/sling/graphql/core/servlet/GraphQLServlet.java  | 4 ++--
 .../java/org/apache/sling/graphql/core/servlet/QueryParser.java     | 6 +++---
 .../org/apache/sling/graphql/core/engine/ResourceQueryTestBase.java | 2 +-
 .../apache/sling/graphql/core/schema/SchemaDescriptionsTest.java    | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index e7da8ca..3ebd656 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,13 +175,13 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.commons.johnzon</artifactId>
-      <version>1.2.6</version>
+      <version>2.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.johnzon</groupId>
       <artifactId>johnzon-mapper</artifactId>
-      <version>1.2.8</version>
+      <version>2.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git 
a/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngine.java
 
b/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngine.java
index 5570e9c..aceaca9 100644
--- 
a/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngine.java
+++ 
b/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngine.java
@@ -28,9 +28,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonWriter;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonWriter;
 import javax.script.AbstractScriptEngine;
 import javax.script.Bindings;
 import javax.script.ScriptContext;
diff --git 
a/src/main/java/org/apache/sling/graphql/core/servlet/GraphQLServlet.java 
b/src/main/java/org/apache/sling/graphql/core/servlet/GraphQLServlet.java
index 3e1427e..fc78036 100644
--- a/src/main/java/org/apache/sling/graphql/core/servlet/GraphQLServlet.java
+++ b/src/main/java/org/apache/sling/graphql/core/servlet/GraphQLServlet.java
@@ -26,8 +26,8 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.json.Json;
-import javax.json.JsonWriter;
+import jakarta.json.Json;
+import jakarta.json.JsonWriter;
 import javax.servlet.Servlet;
 import javax.servlet.http.HttpServletResponse;
 
diff --git 
a/src/main/java/org/apache/sling/graphql/core/servlet/QueryParser.java 
b/src/main/java/org/apache/sling/graphql/core/servlet/QueryParser.java
index 2b6b0ce..5fa28fc 100644
--- a/src/main/java/org/apache/sling/graphql/core/servlet/QueryParser.java
+++ b/src/main/java/org/apache/sling/graphql/core/servlet/QueryParser.java
@@ -24,9 +24,9 @@ import java.io.StringReader;
 import java.util.Collections;
 import java.util.Map;
 
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
 
 import org.apache.johnzon.mapper.Mapper;
 import org.apache.johnzon.mapper.MapperBuilder;
diff --git 
a/src/test/java/org/apache/sling/graphql/core/engine/ResourceQueryTestBase.java 
b/src/test/java/org/apache/sling/graphql/core/engine/ResourceQueryTestBase.java
index efca439..0482e19 100644
--- 
a/src/test/java/org/apache/sling/graphql/core/engine/ResourceQueryTestBase.java
+++ 
b/src/test/java/org/apache/sling/graphql/core/engine/ResourceQueryTestBase.java
@@ -22,7 +22,7 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
 
-import javax.json.Json;
+import jakarta.json.Json;
 
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.servlets.ServletResolver;
diff --git 
a/src/test/java/org/apache/sling/graphql/core/schema/SchemaDescriptionsTest.java
 
b/src/test/java/org/apache/sling/graphql/core/schema/SchemaDescriptionsTest.java
index a6b986f..393505d 100644
--- 
a/src/test/java/org/apache/sling/graphql/core/schema/SchemaDescriptionsTest.java
+++ 
b/src/test/java/org/apache/sling/graphql/core/schema/SchemaDescriptionsTest.java
@@ -22,7 +22,7 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
 
-import javax.json.Json;
+import jakarta.json.Json;
 
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.servlets.ServletResolver;