(sling-org-apache-sling-contentparser-json) branch master updated: SLING-12280 Migrate org.apache.sling.contentparser.json to jakarta.json (#1)

[sseifert]

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

sseifert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-contentparser-json.git


The following commit(s) were added to refs/heads/master by this push:
     new b958912  SLING-12280 Migrate org.apache.sling.contentparser.json to 
jakarta.json (#1)
b958912 is described below

commit b9589121fd01e644c55ac9aae69dfe32f6fa5969
Author: Stefan Seifert <stefanseif...@users.noreply.github.com>
AuthorDate: Mon Apr 8 19:01:46 2024 +0200

    SLING-12280 Migrate org.apache.sling.contentparser.json to jakarta.json (#1)
---
 pom.xml                                                | 10 +++++-----
 .../contentparser/json/internal/JSONContentParser.java | 18 +++++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 094c63f..31d6d09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <artifactId>org.apache.sling.contentparser.json</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
 
     <name>Apache Sling Content Parser for JSON</name>
     <description>
@@ -61,9 +61,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-json_1.0_spec</artifactId>
-            <version>1.0-alpha-1</version>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
+            <version>2.1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>org.apache.johnzon</groupId>
             <artifactId>johnzon-core</artifactId>
-            <version>1.0.0</version>
+            <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git 
a/src/main/java/org/apache/sling/contentparser/json/internal/JSONContentParser.java
 
b/src/main/java/org/apache/sling/contentparser/json/internal/JSONContentParser.java
index 798b62f..2e12639 100644
--- 
a/src/main/java/org/apache/sling/contentparser/json/internal/JSONContentParser.java
+++ 
b/src/main/java/org/apache/sling/contentparser/json/internal/JSONContentParser.java
@@ -29,15 +29,15 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonNumber;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonReaderFactory;
-import javax.json.JsonString;
-import javax.json.JsonValue;
-import javax.json.stream.JsonParsingException;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonReaderFactory;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import jakarta.json.stream.JsonParsingException;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.sling.contentparser.api.ContentHandler;