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-slingfeature-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new ef7b719 SLING-11718 : Migrate to Jakarta JSON API
ef7b719 is described below
commit ef7b719c5df4b06c9d53dcdafdc11442da747f4c
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Tue Dec 6 09:11:04 2022 +0100
SLING-11718 : Migrate to Jakarta JSON API
---
pom.xml | 19 ++++++++++---------
.../org/apache/sling/feature/maven/JSONFeatures.java | 20 ++++++++++----------
.../feature/maven/mojos/apis/ApisConfiguration.java | 10 +++++-----
.../feature/maven/mojos/apis/RegionSupportTest.java | 2 --
4 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/pom.xml b/pom.xml
index b2437ab..ed299b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,15 +137,16 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.1_spec</artifactId>
- <version>1.2</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>
- <version>1.2.14</version>
+ <classifier>jakarta</classifier>
+ <version>1.2.19</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -163,7 +164,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>
@@ -175,13 +176,13 @@
<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>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.analyser</artifactId>
- <version>1.6.8</version>
+ <version>2.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -193,7 +194,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.extension.apiregions</artifactId>
- <version>1.5.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<!-- aux dependencies for Content-Package check -->
@@ -224,7 +225,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.diff</artifactId>
- <version>0.0.6</version>
+ <version>0.1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/feature/maven/JSONFeatures.java
b/src/main/java/org/apache/sling/feature/maven/JSONFeatures.java
index f63bf1b..66e011b 100644
--- a/src/main/java/org/apache/sling/feature/maven/JSONFeatures.java
+++ b/src/main/java/org/apache/sling/feature/maven/JSONFeatures.java
@@ -26,18 +26,18 @@ import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.Map;
-import javax.json.Json;
-import javax.json.JsonException;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
-import javax.json.JsonValue;
-import javax.json.JsonWriter;
-import javax.json.stream.JsonGenerator;
-import javax.json.stream.JsonGeneratorFactory;
+import jakarta.json.Json;
+import jakarta.json.JsonException;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonWriter;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGeneratorFactory;
import org.apache.commons.io.FileUtils;
-import org.apache.felix.cm.json.Configurations;
+import org.apache.felix.cm.json.io.Configurations;
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Artifacts;
diff --git
a/src/main/java/org/apache/sling/feature/maven/mojos/apis/ApisConfiguration.java
b/src/main/java/org/apache/sling/feature/maven/mojos/apis/ApisConfiguration.java
index e0d94ea..b198970 100644
---
a/src/main/java/org/apache/sling/feature/maven/mojos/apis/ApisConfiguration.java
+++
b/src/main/java/org/apache/sling/feature/maven/mojos/apis/ApisConfiguration.java
@@ -26,11 +26,11 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonString;
-import javax.json.JsonValue;
-import javax.json.JsonValue.ValueType;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonValue.ValueType;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
diff --git
a/src/test/java/org/apache/sling/feature/maven/mojos/apis/RegionSupportTest.java
b/src/test/java/org/apache/sling/feature/maven/mojos/apis/RegionSupportTest.java
index f61f53c..789981b 100644
---
a/src/test/java/org/apache/sling/feature/maven/mojos/apis/RegionSupportTest.java
+++
b/src/test/java/org/apache/sling/feature/maven/mojos/apis/RegionSupportTest.java
@@ -156,7 +156,6 @@ public class RegionSupportTest {
// no toggle set, but toggle uses previous version
e2.setPreviousArtifactId(ArtifactId.parse("g:b:0.1"));
- e2.setPreviousPackageVersion("1.0");
used = support.computeAllUsedExportPackages(regions,
Collections.emptySet(), exportedPackages, bundle);
assertEquals(3, used.size());
assertTrue(used.contains("p1"));
@@ -208,7 +207,6 @@ public class RegionSupportTest {
// no toggle set, but toggle uses previous version -> empty result
e2.setPreviousArtifactId(ArtifactId.parse("g:b:0.1"));
- e2.setPreviousPackageVersion("1.0");
used = support.computeAllUsedExportPackages(regions,
Collections.emptySet(), exportedPackages, bundle);
assertTrue(used.isEmpty());
