[felix-dev] branch master updated: Switch to Apache Sling Commons Johnzon

[cziegeler]

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/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new 9efa1c2ae8 Switch to Apache Sling Commons Johnzon
9efa1c2ae8 is described below

commit 9efa1c2ae8e80d49e40e37520e18ac924de05d8d
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Thu Jul 20 08:39:27 2023 +0200

    Switch to Apache Sling Commons Johnzon
---
 converter/schematizer/pom.xml                        | 20 +++++++-------------
 converter/serializer/pom.xml                         |  4 ++--
 .../serializer/impl/json/JsonSerializerTest.java     | 18 ++++++++++--------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/converter/schematizer/pom.xml b/converter/schematizer/pom.xml
index fc80e5040f..a056cba5db 100644
--- a/converter/schematizer/pom.xml
+++ b/converter/schematizer/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
-        <version>4</version>
+        <version>7</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>5.1.9</version>
                 <executions>
                     <execution>
                         <id>bundle</id>
@@ -115,9 +115,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.converter</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.util.converter</artifactId>
+            <version>1.0.9</version>
         </dependency>
 
         <dependency>
@@ -143,21 +143,15 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.utils</artifactId>
-            <version>1.9.1-SNAPSHOT</version>
+            <version>1.11.8</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.json</artifactId>
-            <version>2.0.16</version>
-            <scope>test</scope>            
-        </dependency>
     </dependencies>
 </project>
diff --git a/converter/serializer/pom.xml b/converter/serializer/pom.xml
index 2497b40a36..cd51ecb48e 100644
--- a/converter/serializer/pom.xml
+++ b/converter/serializer/pom.xml
@@ -134,8 +134,8 @@
         
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.json</artifactId>
-            <version>2.0.16</version>
+            <artifactId>org.apache.sling.commons.johnzon</artifactId>
+            <version>1.2.14</version>
             <scope>test</scope>            
         </dependency>
     </dependencies>
diff --git 
a/converter/serializer/src/test/java/org/apache/felix/serializer/impl/json/JsonSerializerTest.java
 
b/converter/serializer/src/test/java/org/apache/felix/serializer/impl/json/JsonSerializerTest.java
index c662f70c9d..32be3c8ba1 100644
--- 
a/converter/serializer/src/test/java/org/apache/felix/serializer/impl/json/JsonSerializerTest.java
+++ 
b/converter/serializer/src/test/java/org/apache/felix/serializer/impl/json/JsonSerializerTest.java
@@ -16,13 +16,15 @@
  */
 package org.apache.felix.serializer.impl.json;
 
+import java.io.StringReader;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.json.Json;
+import javax.json.JsonObject;
+
 import org.apache.felix.serializer.impl.json.MyDTO.Count;
 import org.apache.felix.serializer.impl.json.MyEmbeddedDTO.Alpha;
-import org.apache.sling.commons.json.JSONException;
-import org.apache.sling.commons.json.JSONObject;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -60,10 +62,10 @@ public class JsonSerializerTest {
         JsonSerializerImpl jsonCodec = new JsonSerializerImpl();
         String json = jsonCodec.serialize(m).toString();
 
-        JSONObject jo = new JSONObject(json);
+        JsonObject jo = Json.createReader(new StringReader(json)).readObject();
         assertEquals(11, jo.getInt("1"));
         assertEquals("cd", jo.getString("ab"));
-        JSONObject jo2 = jo.getJSONObject("true");
+        JsonObject jo2 = jo.getJsonObject("true");
         assertEquals(true, jo2.getBoolean("x"));
         assertTrue(jo2.isNull("y"));
 
@@ -77,7 +79,7 @@ public class JsonSerializerTest {
     }
 
     @Test
-    public void testCodecWithAdapter() throws JSONException {
+    public void testCodecWithAdapter() {
         Map<String, Foo> m1 = new HashMap<>();
         m1.put("f", new Foo("fofofo"));
         Map<String, Map<String,Foo>> m = new HashMap<>();
@@ -90,9 +92,9 @@ public class JsonSerializerTest {
         JsonSerializerImpl jsonCodec = new JsonSerializerImpl();
         String json = jsonCodec.serialize(m).convertWith(ca).toString();
 
-        JSONObject jo = new JSONObject(json);
-        assertEquals(1, jo.length());
-        JSONObject jo1 = jo.getJSONObject("submap");
+        JsonObject jo = Json.createReader(new StringReader(json)).readObject();
+        assertEquals(1, jo.size());
+        JsonObject jo1 = jo.getJsonObject("submap");
         assertEquals("<fofofo>", jo1.getString("f"));
 
         // And convert back