You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2023/01/06 10:34:02 UTC
[sling-org-apache-sling-feature-launcher] branch master updated: SLING-11718 : Migrate to Jakarta JSON API
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-launcher.git
The following commit(s) were added to refs/heads/master by this push:
new 3915c17 SLING-11718 : Migrate to Jakarta JSON API
3915c17 is described below
commit 3915c17421d599aa9543168ddc4b3e56463c7609
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Dec 6 08:18:06 2022 +0100
SLING-11718 : Migrate to Jakarta JSON API
---
pom.xml | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6ae3ab5..467f3f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,9 +166,8 @@
<exclude>org.osgi:osgi.annotation</exclude>
<exclude>org.osgi:org.osgi.annotation.versioning</exclude>
<exclude>org.apache.felix:org.apache.felix.converter</exclude><!-- relocated to org.osgi.util.converter -->
- <exclude>org.apache.johnzon:johnzon-core</exclude><!-- embedded in org.apache.sling.commons.johnzon -->
- <exclude>org.apache.geronimo.specs:geronimo-json_1.1_spec</exclude><!-- embedded in org.apache.sling.commons.johnzon -->
<exclude>org.apache.felix:org.apache.felix.utils</exclude><!-- embedded in org.apache.sling.feature -->
+ <exclude>org.apache.geronimo.specs:geronimo-json_1.1_spec</exclude><!-- not needed, jakarta.json is used -->
<exclude>org.osgi:org.osgi.core</exclude><!-- contained in org.osgi:osgi.core -->
<exclude>org.osgi:org.osgi.service.configurator</exclude><!-- wrongly flagged to be needed by cm.json -->
<exclude>org.osgi:org.osgi.service.feature</exclude><!-- Optional dependency for feature model -->
@@ -266,7 +265,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -284,7 +283,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.cm.json</artifactId>
- <version>1.0.6</version>
+ <version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -294,16 +293,17 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.johnzon</artifactId>
- <version>1.2.14</version>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <version>2.0.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-core</artifactId>
+ <classifier>jakarta</classifier>
+ <version>1.2.19</version>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation.versioning</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- for generating service descriptor files -->
<dependency>