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:30:31 UTC
[sling-org-apache-sling-feature-launcher] branch master updated: Revert "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 f4ac4c0 Revert "SLING-11718 : Migrate to Jakarta JSON API"
f4ac4c0 is described below
commit f4ac4c039c60017201af41b2620edeba2927282c
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Jan 6 12:30:09 2023 +0200
Revert "SLING-11718 : Migrate to Jakarta JSON API"
This reverts commit cc75f4079c1d469e4523d1f61f11bec4f112e692, in preparation for a bugfix release.
---
pom.xml | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 162c15b..04d7e7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,8 +166,9 @@
<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 -->
@@ -265,7 +266,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>1.3.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -283,7 +284,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.cm.json</artifactId>
- <version>2.0.0</version>
+ <version>1.0.6</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -293,17 +294,16 @@
<scope>compile</scope>
</dependency>
<dependency>
- <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>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.johnzon</artifactId>
+ <version>1.2.14</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>