[sling-org-apache-sling-xss] branch master updated: SLING-12070: migrate to jakarta.json (#35)

[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-xss.git


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

commit c533c5df64e7eff18630f54d5ebe0d8186e40beb
Author: Ashok Pelluru <37666786+apell...@users.noreply.github.com>
AuthorDate: Mon Oct 16 09:46:36 2023 +0200

    SLING-12070: migrate to jakarta.json (#35)
    
    * SLING-12070: migrate to jakarta.json
    
    * SLING-12094 - Use GitHub for the Maven scm.url value
    
    ---------
    
    Co-authored-by: Robert Munteanu <romb...@apache.org>
---
 pom.xml                                                | 18 +++++++++++++++---
 .../java/org/apache/sling/xss/impl/XSSAPIImpl.java     |  4 ++--
 .../webconsole/XSSProtectionAPIWebConsolePlugin.java   |  8 ++++----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3193ed2..407405e 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>
 
@@ -42,8 +42,8 @@
         
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git</connection>
         
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git</developerConnection>
         <url>https://github.com/apache/sling-org-apache-sling-xss.git</url>
-      <tag>org.apache.sling.xss-2.3.6</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
 
     <properties>
         
<project.build.outputTimestamp>1688122669</project.build.outputTimestamp>
@@ -274,6 +274,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 +404,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;