[sling-org-apache-sling-servlets-post] branch master updated: SLING-12069: migrate to jakarta.json (#24)

[apelluru]

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

apelluru pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-post.git


The following commit(s) were added to refs/heads/master by this push:
     new 55ef8a0  SLING-12069: migrate to jakarta.json (#24)
55ef8a0 is described below

commit 55ef8a0bec544d2a8efd44a13f67217d8742312a
Author: Ashok Pelluru <37666786+apell...@users.noreply.github.com>
AuthorDate: Thu Oct 5 09:16:45 2023 +0200

    SLING-12069: migrate to jakarta.json (#24)
---
 pom.xml                                            | 25 +++++++++++++++++-----
 .../apache/sling/servlets/post/JSONResponse.java   | 10 ++++-----
 .../sling/servlets/post/JsonResponseTest.java      | 13 ++++++-----
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index e0f778f..ebc77ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling-bundle-parent</artifactId>
-        <version>46</version>
+        <version>52</version>
         <relativePath />
     </parent>
 
@@ -39,8 +39,8 @@
         
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-post.git</connection>
         
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-post.git</developerConnection>
         
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-servlets-post.git</url>
-      <tag>HEAD</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
 
     <properties>
         <site.jira.version.id>12314180</site.jira.version.id>
@@ -110,12 +110,12 @@
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.annotation.versioning</artifactId>
+            <artifactId>org.osgi.framework</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
+            <artifactId>org.osgi.annotation.versioning</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -131,14 +131,23 @@
          <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
+             <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
+            <version>2.0.2</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -206,6 +215,12 @@
             <version>1.4.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.json</artifactId>
+            <version>2.0.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/src/main/java/org/apache/sling/servlets/post/JSONResponse.java 
b/src/main/java/org/apache/sling/servlets/post/JSONResponse.java
index b4e7e45..a7a0e17 100644
--- a/src/main/java/org/apache/sling/servlets/post/JSONResponse.java
+++ b/src/main/java/org/apache/sling/servlets/post/JSONResponse.java
@@ -21,11 +21,11 @@ package org.apache.sling.servlets.post;
 
 import org.apache.sling.jcr.contentparser.impl.JsonTicksConverter;
 
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonStructure;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonStructure;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.StringReader;
diff --git a/src/test/java/org/apache/sling/servlets/post/JsonResponseTest.java 
b/src/test/java/org/apache/sling/servlets/post/JsonResponseTest.java
index c2b18ee..c1868fe 100644
--- a/src/test/java/org/apache/sling/servlets/post/JsonResponseTest.java
+++ b/src/test/java/org/apache/sling/servlets/post/JsonResponseTest.java
@@ -22,13 +22,12 @@ import java.io.StringReader;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonNumber;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonString;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
 import javax.servlet.http.HttpServletResponse;
 
 import junit.framework.TestCase;