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-get.git
The following commit(s) were added to refs/heads/master by this push:
new 582410b SLING-12073: migrate to jakarta.json (#13)
582410b is described below
commit 582410b3fac6028af164a2f2322f2b03b9ecf9ca
Author: Ashok Pelluru <[email protected]>
AuthorDate: Thu Oct 5 09:20:57 2023 +0200
SLING-12073: migrate to jakarta.json (#13)
---
pom.xml | 37 +++++++++++++++++-----
.../sling/servlets/get/impl/SlingInfoServlet.java | 4 +--
.../servlets/get/impl/VersionInfoServlet.java | 8 ++---
.../servlets/get/impl/helpers/JsonRenderer.java | 4 +--
.../servlets/get/impl/util/JsonObjectCreator.java | 8 ++---
.../sling/servlets/get/impl/util/JsonToText.java | 12 +++----
.../servlets/get/impl/util/ResourceTraversor.java | 4 +--
.../get/impl/helpers/JsonRendererTest.java | 8 ++---
.../get/impl/util/JsonObjectCreatorTest.java | 6 ++--
9 files changed, 56 insertions(+), 35 deletions(-)
diff --git a/pom.xml b/pom.xml
index a8a4dc2..5ff4cb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>48</version>
+ <version>52</version>
<relativePath />
</parent>
@@ -40,12 +40,11 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-servlets-get.git</url>
- <tag>HEAD</tag>
- </scm>
+ <tag>HEAD</tag>
+ </scm>
<properties>
<site.jira.version.id>12314473</site.jira.version.id>
- <project.build.outputTimestamp>1</project.build.outputTimestamp>
</properties>
<build>
@@ -89,13 +88,31 @@
</plugins>
</build>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <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>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.owasp.encoder</groupId>
@@ -109,18 +126,16 @@
<version>2.16.4</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit-addons</groupId>
@@ -194,5 +209,11 @@
<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/get/impl/SlingInfoServlet.java
b/src/main/java/org/apache/sling/servlets/get/impl/SlingInfoServlet.java
index 3942e06..90c53fe 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/SlingInfoServlet.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/SlingInfoServlet.java
@@ -24,8 +24,8 @@ import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
-import javax.json.Json;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.Json;
+import jakarta.json.stream.JsonGenerator;
import javax.servlet.Servlet;
import javax.servlet.http.HttpServletResponse;
diff --git
a/src/main/java/org/apache/sling/servlets/get/impl/VersionInfoServlet.java
b/src/main/java/org/apache/sling/servlets/get/impl/VersionInfoServlet.java
index 23d9187..18f6da4 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/VersionInfoServlet.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/VersionInfoServlet.java
@@ -32,10 +32,10 @@ import javax.jcr.version.Version;
import javax.jcr.version.VersionHistory;
import javax.jcr.version.VersionIterator;
import javax.jcr.version.VersionManager;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
diff --git
a/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRenderer.java
b/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRenderer.java
index b1648c4..cca3eee 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRenderer.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRenderer.java
@@ -20,8 +20,8 @@ import java.io.IOException;
import java.io.StringWriter;
import java.math.BigInteger;
-import javax.json.Json;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.Json;
+import jakarta.json.stream.JsonGenerator;
import javax.servlet.http.HttpServletResponse;
import org.apache.sling.api.SlingException;
diff --git
a/src/main/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreator.java
b/src/main/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreator.java
index bdfaf02..7c08a2d 100644
---
a/src/main/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreator.java
+++
b/src/main/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreator.java
@@ -30,10 +30,10 @@ import java.util.Locale;
import java.util.Map;
import java.util.function.Supplier;
-import javax.json.Json;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
import org.apache.jackrabbit.util.ISO8601;
import org.apache.sling.api.resource.Resource;
diff --git
a/src/main/java/org/apache/sling/servlets/get/impl/util/JsonToText.java
b/src/main/java/org/apache/sling/servlets/get/impl/util/JsonToText.java
index 9165042..f180c7e 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/util/JsonToText.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/util/JsonToText.java
@@ -21,12 +21,12 @@ package org.apache.sling.servlets.get.impl.util;
import java.util.Iterator;
import java.util.Map;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
public class JsonToText
{
diff --git
a/src/main/java/org/apache/sling/servlets/get/impl/util/ResourceTraversor.java
b/src/main/java/org/apache/sling/servlets/get/impl/util/ResourceTraversor.java
index b65cb0f..81f6012 100644
---
a/src/main/java/org/apache/sling/servlets/get/impl/util/ResourceTraversor.java
+++
b/src/main/java/org/apache/sling/servlets/get/impl/util/ResourceTraversor.java
@@ -25,8 +25,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
import org.apache.sling.api.request.RecursionTooDeepException;
import org.apache.sling.api.resource.Resource;
diff --git
a/src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java
b/src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java
index 6881796..350d580 100644
---
a/src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java
+++
b/src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java
@@ -26,10 +26,10 @@ import java.io.IOException;
import java.io.StringReader;
import java.util.Calendar;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonPatch;
-import javax.json.JsonReader;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonPatch;
+import jakarta.json.JsonReader;
import org.apache.jackrabbit.util.ISO8601;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
diff --git
a/src/test/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreatorTest.java
b/src/test/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreatorTest.java
index 293bff0..f28b8b4 100644
---
a/src/test/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreatorTest.java
+++
b/src/test/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreatorTest.java
@@ -24,9 +24,9 @@ import static org.junit.Assert.assertNull;
import java.util.HashMap;
import java.util.Map;
-import javax.json.JsonString;
-import javax.json.JsonValue;
-import javax.json.JsonValue.ValueType;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonValue.ValueType;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.wrappers.ValueMapDecorator;
