This is an automated email from the ASF dual-hosted git repository.
enapps-enorman pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git
The following commit(s) were added to refs/heads/master by this push:
new b68af57 SLING-13171 use jakarta.json for JSON parsing (#28)
b68af57 is described below
commit b68af571c2d7012afcbaeced1950f32715621bc5
Author: Eric Norman <[email protected]>
AuthorDate: Tue Nov 3 12:53:45 2026 -0800
SLING-13171 use jakarta.json for JSON parsing (#28)
---
pom.xml | 12 ++++++------
.../java/org/apache/sling/i18n/impl/JcrResourceBundle.java | 9 ++++-----
src/test/java/org/apache/sling/i18n/it/I18nTestSupport.java | 8 --------
3 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index af0c841..7c3f8e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,9 +117,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.1_spec</artifactId>
- <version>1.5</version>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <version>2.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -213,9 +213,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-core</artifactId>
- <version>1.2.22</version>
+ <groupId>org.eclipse.parsson</groupId>
+ <artifactId>parsson</artifactId>
+ <version>1.1.3</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
b/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
index 559e37d..bbfd6e4 100644
--- a/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
+++ b/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
@@ -18,11 +18,6 @@
*/
package org.apache.sling.i18n.impl;
-import javax.json.spi.JsonProvider;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParser.Event;
-import javax.json.stream.JsonParsingException;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -42,6 +37,10 @@ import java.util.Map;
import java.util.ResourceBundle;
import java.util.Set;
+import jakarta.json.spi.JsonProvider;
+import jakarta.json.stream.JsonParser;
+import jakarta.json.stream.JsonParser.Event;
+import jakarta.json.stream.JsonParsingException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
diff --git a/src/test/java/org/apache/sling/i18n/it/I18nTestSupport.java
b/src/test/java/org/apache/sling/i18n/it/I18nTestSupport.java
index 387e108..e4725b3 100644
--- a/src/test/java/org/apache/sling/i18n/it/I18nTestSupport.java
+++ b/src/test/java/org/apache/sling/i18n/it/I18nTestSupport.java
@@ -76,14 +76,6 @@ public abstract class I18nTestSupport extends TestSupport {
.groupId("org.apache.felix")
.artifactId("org.apache.felix.http.wrappers")
.versionAsInProject(),
- mavenBundle()
- .groupId("org.apache.geronimo.specs")
- .artifactId("geronimo-json_1.1_spec")
- .version("1.5"),
- mavenBundle()
- .groupId("org.apache.johnzon")
- .artifactId("johnzon-core")
- .versionAsInProject(),
mavenBundle()
.groupId("org.apache.sling")
.artifactId("org.apache.sling.commons.johnzon")
