This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new 9e94e3c SLING-12075 : Migrate sling.servlets.resolver to jakarta.json
9e94e3c is described below
commit 9e94e3ca03e7705624754788461199dc11ec5d90
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Thu Oct 5 13:00:25 2023 +0200
SLING-12075 : Migrate sling.servlets.resolver to jakarta.json
---
pom.xml | 12 ++++++------
.../internal/defaults/DefaultErrorHandlerServlet.java | 4 ++--
.../resolver/internal/console/WebConsolePluginTest.java | 2 +-
.../internal/defaults/DefaultErrorHandlerServletTest.java | 6 +++---
.../org/apache/sling/servlets/resolver/it/SLING10478IT.java | 6 +++---
.../servlets/resolver/it/ServletResolverTestSupport.java | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8c59441..b79f2de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,9 +202,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.1_spec</artifactId>
- <version>1.3</version>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <version>2.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -399,9 +399,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.johnzon</artifactId>
- <version>1.2.6</version>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.json</artifactId>
+ <version>2.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java
b/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java
index 695f2c4..7e64683 100644
---
a/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java
+++
b/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import javax.json.Json;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.Json;
+import jakarta.json.stream.JsonGenerator;
import javax.servlet.GenericServlet;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
diff --git
a/src/test/java/org/apache/sling/servlets/resolver/internal/console/WebConsolePluginTest.java
b/src/test/java/org/apache/sling/servlets/resolver/internal/console/WebConsolePluginTest.java
index b5b0d2f..5a6180b 100644
---
a/src/test/java/org/apache/sling/servlets/resolver/internal/console/WebConsolePluginTest.java
+++
b/src/test/java/org/apache/sling/servlets/resolver/internal/console/WebConsolePluginTest.java
@@ -32,7 +32,7 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-import javax.json.Json;
+import jakarta.json.Json;
import javax.servlet.Servlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git
a/src/test/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServletTest.java
b/src/test/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServletTest.java
index 4a91034..e771001 100644
---
a/src/test/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServletTest.java
+++
b/src/test/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServletTest.java
@@ -27,9 +27,9 @@ import java.io.StringWriter;
import java.util.Enumeration;
import java.util.regex.Pattern;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
diff --git
a/src/test/java/org/apache/sling/servlets/resolver/it/SLING10478IT.java
b/src/test/java/org/apache/sling/servlets/resolver/it/SLING10478IT.java
index 1453697..6d4df30 100644
--- a/src/test/java/org/apache/sling/servlets/resolver/it/SLING10478IT.java
+++ b/src/test/java/org/apache/sling/servlets/resolver/it/SLING10478IT.java
@@ -27,8 +27,8 @@ import java.io.PrintWriter;
import java.io.Writer;
import java.lang.reflect.InvocationTargetException;
-import javax.json.Json;
-import javax.json.stream.JsonGenerator;
+import jakarta.json.Json;
+import jakarta.json.stream.JsonGenerator;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -121,7 +121,7 @@ public class SLING10478IT extends
ServletResolverTestSupport {
try {
final String output = executeRequest(M_GET, path,
HttpServletResponse.SC_NOT_FOUND).getOutputAsString();
assertNotNull(output);
- assertTrue(output.contains("hello"));
+ assertTrue(output, output.contains("hello"));
} catch (InvocationTargetException t) {
Throwable cause = t.getCause();
if (cause instanceof IllegalStateException && "Writer Already
Closed".equals(cause.getMessage())) {
diff --git
a/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
b/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
index bcb6153..939198e 100644
---
a/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
+++
b/src/test/java/org/apache/sling/servlets/resolver/it/ServletResolverTestSupport.java
@@ -32,7 +32,6 @@ import
org.apache.sling.servlethelpers.MockSlingHttpServletResponse;
import org.apache.sling.testing.paxexam.TestSupport;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.options.ModifiableCompositeOption;
import org.ops4j.pax.exam.options.extra.VMOption;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -121,6 +120,7 @@ public class ServletResolverTestSupport extends TestSupport
{
testBundle(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.spi").versionAsInProject(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlet-helpers").versionAsInProject(),
+
mavenBundle().groupId("org.glassfish").artifactId("jakarta.json").versionAsInProject(),
//
mavenBundle().groupId("commons-codec").artifactId("commons-codec").version("1.15"),
//
