[sling-org-apache-sling-xss] branch SLING-12070 updated: SLING-12070: migrate to jakarta.json

[apelluru]

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

apelluru pushed a commit to branch SLING-12070
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git


The following commit(s) were added to refs/heads/SLING-12070 by this push:
     new 03a8408  SLING-12070: migrate to jakarta.json
03a8408 is described below

commit 03a8408eb9f0973dc8a63651b7fed07f0b64766f
Author: Ashok Pelluru <ashokmc...@gmail.com>
AuthorDate: Wed Oct 4 10:18:15 2023 +0200

    SLING-12070: migrate to jakarta.json
---
 pom.xml                                                   | 15 +++++++++++++--
 src/main/java/org/apache/sling/xss/impl/XSSAPIImpl.java   |  4 ++--
 .../impl/webconsole/XSSProtectionAPIWebConsolePlugin.java |  8 ++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8909f32..cb8072a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling-bundle-parent</artifactId>
-        <version>49</version>
+        <version>52</version>
         <relativePath />
     </parent>
 
@@ -47,7 +47,6 @@
 
     <properties>
         
<project.build.outputTimestamp>1688122669</project.build.outputTimestamp>
-        <sling.java.version>8</sling.java.version>
     </properties>
 
 
@@ -274,6 +273,12 @@
             <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>org.osgi</groupId>
@@ -398,6 +403,12 @@
             <version>1.7.25</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.json</artifactId>
+            <version>2.0.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <profiles>
diff --git a/src/main/java/org/apache/sling/xss/impl/XSSAPIImpl.java 
b/src/main/java/org/apache/sling/xss/impl/XSSAPIImpl.java
index f5d5e88..0c30461 100644
--- a/src/main/java/org/apache/sling/xss/impl/XSSAPIImpl.java
+++ b/src/main/java/org/apache/sling/xss/impl/XSSAPIImpl.java
@@ -22,8 +22,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import javax.json.Json;
-import javax.json.JsonReaderFactory;
+import jakarta.json.Json;
+import jakarta.json.JsonReaderFactory;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
diff --git 
a/src/main/java/org/apache/sling/xss/impl/webconsole/XSSProtectionAPIWebConsolePlugin.java
 
b/src/main/java/org/apache/sling/xss/impl/webconsole/XSSProtectionAPIWebConsolePlugin.java
index 8c53d22..c389d10 100644
--- 
a/src/main/java/org/apache/sling/xss/impl/webconsole/XSSProtectionAPIWebConsolePlugin.java
+++ 
b/src/main/java/org/apache/sling/xss/impl/webconsole/XSSProtectionAPIWebConsolePlugin.java
@@ -28,10 +28,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonWriter;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonWriter;
 import javax.servlet.Servlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;