(sling-org-apache-sling-caconfig-impl) branch master updated: SLING-12064: migrate to jakarta.json (#7)

[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-caconfig-impl.git


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

commit 505bd93baa32c2ff3cc1bea2a7d2b1da140c97ec
Author: Ashok Pelluru <37666786+apell...@users.noreply.github.com>
AuthorDate: Wed Nov 8 13:16:02 2023 +0100

    SLING-12064: migrate to jakarta.json (#7)
---
 pom.xml                                            | 41 ++++++++++++++++++++--
 .../impl/override/OverrideStringParser.java        | 18 +++++-----
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 73ed62e..9dcb3a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling-bundle-parent</artifactId>
-        <version>46</version>
+        <version>52</version>
         <relativePath />
     </parent>
 
@@ -85,6 +85,11 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.annotation.versioning</artifactId>
@@ -108,6 +113,12 @@
             <version>1.4.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
+            <version>2.0.2</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
@@ -120,7 +131,27 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.metatype.annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.framework</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.util.tracker</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -204,6 +235,12 @@
             <version>4.1.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.json</artifactId>
+            <version>2.0.1</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 
diff --git 
a/src/main/java/org/apache/sling/caconfig/impl/override/OverrideStringParser.java
 
b/src/main/java/org/apache/sling/caconfig/impl/override/OverrideStringParser.java
index bccf14a..ef88f02 100644
--- 
a/src/main/java/org/apache/sling/caconfig/impl/override/OverrideStringParser.java
+++ 
b/src/main/java/org/apache/sling/caconfig/impl/override/OverrideStringParser.java
@@ -32,15 +32,15 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonException;
-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 jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonException;
+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 org.apache.commons.lang3.ClassUtils;
 import org.apache.commons.lang3.StringUtils;