You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2024/01/18 16:00:27 UTC
(sling-org-apache-sling-installer-core) branch master updated: SLING-12231 : Replace javax.json with jakarta.json
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-installer-core.git
The following commit(s) were added to refs/heads/master by this push:
new ab56c53 SLING-12231 : Replace javax.json with jakarta.json
ab56c53 is described below
commit ab56c53b4d0a5e9cb0fb5cfb6a1af465f5d80fef
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jan 18 17:00:20 2024 +0100
SLING-12231 : Replace javax.json with jakarta.json
---
pom.xml | 4 ++--
.../java/org/apache/sling/installer/core/impl/InternalResource.java | 4 ++--
.../installer/core/impl/serializer/JsonConfigurationSerializer.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index a744597..5a6a864 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.johnzon</artifactId>
- <version>1.2.0</version>
+ <version>2.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -217,7 +217,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.cm.json</artifactId>
- <version>1.0.6</version>
+ <version>2.0.4</version>
<scope>provided</scope>
</dependency>
<!-- Basic dependencies for Unit Tests -->
diff --git a/src/main/java/org/apache/sling/installer/core/impl/InternalResource.java b/src/main/java/org/apache/sling/installer/core/impl/InternalResource.java
index b449ac3..f887562 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/InternalResource.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/InternalResource.java
@@ -33,7 +33,7 @@ import java.util.List;
import java.util.Properties;
import org.apache.felix.cm.file.ConfigurationHandler;
-import org.apache.felix.cm.json.Configurations;
+import org.apache.felix.cm.json.io.Configurations;
import org.apache.sling.installer.api.InstallableResource;
/**
@@ -313,4 +313,4 @@ public class InternalResource extends InstallableResource {
}
return id;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/installer/core/impl/serializer/JsonConfigurationSerializer.java b/src/main/java/org/apache/sling/installer/core/impl/serializer/JsonConfigurationSerializer.java
index 0f7d84e..bb1c6c8 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/serializer/JsonConfigurationSerializer.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/serializer/JsonConfigurationSerializer.java
@@ -25,7 +25,7 @@ import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.util.Dictionary;
-import org.apache.felix.cm.json.Configurations;
+import org.apache.felix.cm.json.io.Configurations;
import org.apache.sling.installer.api.serializer.ConfigurationSerializer;
/** Serializes dictionary configuration objects (as specified in the configuration admin) into JSON format.