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-feature-analyser.git
The following commit(s) were added to refs/heads/master by this push:
new dbda456 SLING-11718 : Migrate to Jakarta JSON API
dbda456 is described below
commit dbda4568805c56a95345f75a85d9cf6aa9a6c629
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Tue Dec 6 06:55:51 2022 +0100
SLING-11718 : Migrate to Jakarta JSON API
---
pom.xml | 17 +++++++++--------
.../analyser/extensions/AnalyserMetaDataExtension.java | 8 ++++----
.../analyser/task/impl/CheckApisJarsProperties.java | 6 +++---
.../apache/sling/feature/scanner/BundleDescriptor.java | 9 ---------
.../java/org/apache/sling/feature/scanner/Scanner.java | 15 ---------------
.../feature/scanner/impl/BundleDescriptorImpl.java | 9 ---------
.../feature/scanner/impl/FelixFrameworkScanner.java | 5 -----
.../org/apache/sling/feature/scanner/package-info.java | 2 +-
.../feature/scanner/impl/ContentPackageScannerTest.java | 2 --
9 files changed, 17 insertions(+), 56 deletions(-)
diff --git a/pom.xml b/pom.xml
index 945eefc..3c49f13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.feature.analyser</artifactId>
- <version>1.6.9-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Apache Sling Feature Model Analyser</name>
<description>
@@ -91,9 +91,9 @@
</build>
<dependencies>
<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>provided</scope>
</dependency>
<dependency>
@@ -126,13 +126,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature</artifactId>
- <version>1.2.28</version>
+ <version>2.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.cm.json</artifactId>
- <version>1.0.6</version>
+ <version>2.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -195,12 +195,13 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.22.0</version>
+ <version>4.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
+ <classifier>jakarta</classifier>
<version>1.2.14</version>
<scope>test</scope>
</dependency>
@@ -208,7 +209,7 @@
<!-- Used by some tests -->
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>6.0.3</version>
+ <version>7.0.5</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/src/main/java/org/apache/sling/feature/analyser/extensions/AnalyserMetaDataExtension.java
b/src/main/java/org/apache/sling/feature/analyser/extensions/AnalyserMetaDataExtension.java
index 7324772..61c574f 100644
---
a/src/main/java/org/apache/sling/feature/analyser/extensions/AnalyserMetaDataExtension.java
+++
b/src/main/java/org/apache/sling/feature/analyser/extensions/AnalyserMetaDataExtension.java
@@ -22,10 +22,10 @@ import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.scanner.BundleDescriptor;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git
a/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckApisJarsProperties.java
b/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckApisJarsProperties.java
index 9a01c03..6f0f233 100644
---
a/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckApisJarsProperties.java
+++
b/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckApisJarsProperties.java
@@ -20,9 +20,9 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Arrays;
-import javax.json.JsonObject;
-import javax.json.JsonValue;
-import javax.json.JsonValue.ValueType;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonValue.ValueType;
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.ArtifactId;
diff --git
a/src/main/java/org/apache/sling/feature/scanner/BundleDescriptor.java
b/src/main/java/org/apache/sling/feature/scanner/BundleDescriptor.java
index aad85f4..1333262 100644
--- a/src/main/java/org/apache/sling/feature/scanner/BundleDescriptor.java
+++ b/src/main/java/org/apache/sling/feature/scanner/BundleDescriptor.java
@@ -58,15 +58,6 @@ public abstract class BundleDescriptor extends
ArtifactDescriptor implements Com
@Override
public abstract Manifest getManifest();
- /**
- * Get the start level
- *
- * @return The start level.
- * @deprecated Use start order of the bundle
- */
- @Deprecated
- public abstract int getBundleStartLevel();
-
/**
* Is the bundle exporting a package?
* @param packageName Package name
diff --git a/src/main/java/org/apache/sling/feature/scanner/Scanner.java
b/src/main/java/org/apache/sling/feature/scanner/Scanner.java
index 0f81d40..5b46880 100644
--- a/src/main/java/org/apache/sling/feature/scanner/Scanner.java
+++ b/src/main/java/org/apache/sling/feature/scanner/Scanner.java
@@ -121,21 +121,6 @@ public class Scanner {
return this.doScan(bundle, bundle.getStartOrder());
}
- /**
- * Scan a bundle
- *
- * @param bundle The bundle artifact
- * @param startLevel The start level of the bundle
- * @return The bundle descriptor
- * @throws IOException If something goes wrong or the provided artifact is
not a
- * bundle.
- * @deprecated Use {@link #scanBundle(Artifact)}
- */
- @Deprecated
- public BundleDescriptor scan(final Artifact bundle, final int startLevel)
throws IOException {
- return this.doScan(bundle, startLevel);
- }
-
private BundleDescriptor doScan(final Artifact bundle, final int
startLevel) throws IOException {
final String key = bundle.getId().toMvnId().concat(":")
.concat(String.valueOf(startLevel)).concat(":")
diff --git
a/src/main/java/org/apache/sling/feature/scanner/impl/BundleDescriptorImpl.java
b/src/main/java/org/apache/sling/feature/scanner/impl/BundleDescriptorImpl.java
index f91718d..e69dffa 100644
---
a/src/main/java/org/apache/sling/feature/scanner/impl/BundleDescriptorImpl.java
+++
b/src/main/java/org/apache/sling/feature/scanner/impl/BundleDescriptorImpl.java
@@ -179,15 +179,6 @@ public class BundleDescriptorImpl
return bundleVersion;
}
- /**
- * Get the start level
- * @return The start level or {@code 0} for the default.
- */
- @Override
- public int getBundleStartLevel() {
- return startLevel;
- }
-
@Override
public URL getArtifactFile() {
if (artifactFile == null && artifactProvider != null) {
diff --git
a/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
b/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
index 8c3d85c..c7db4b9 100644
---
a/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
+++
b/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
@@ -85,11 +85,6 @@ public class FelixFrameworkScanner implements
FrameworkScanner {
return framework.getOSGiVersion().toString();
}
- @Override
- public int getBundleStartLevel() {
- return 0;
- }
-
@Override
public URL getArtifactFile() {
return platformFile;
diff --git a/src/main/java/org/apache/sling/feature/scanner/package-info.java
b/src/main/java/org/apache/sling/feature/scanner/package-info.java
index c0f3a77..8fdbfc7 100644
--- a/src/main/java/org/apache/sling/feature/scanner/package-info.java
+++ b/src/main/java/org/apache/sling/feature/scanner/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
[email protected]("2.3.0")
[email protected]("3.0.0")
package org.apache.sling.feature.scanner;
diff --git
a/src/test/java/org/apache/sling/feature/scanner/impl/ContentPackageScannerTest.java
b/src/test/java/org/apache/sling/feature/scanner/impl/ContentPackageScannerTest.java
index 6a103ee..6da6a09 100644
---
a/src/test/java/org/apache/sling/feature/scanner/impl/ContentPackageScannerTest.java
+++
b/src/test/java/org/apache/sling/feature/scanner/impl/ContentPackageScannerTest.java
@@ -61,7 +61,6 @@ public class ContentPackageScannerTest {
return new File(getClass().getResource(path).toURI());
}
- @SuppressWarnings("deprecation")
private void assetDescriptor(ContentPackageDescriptorImpl desc, String
descName, final ArtifactId descArtifactId, final URL descUrl) {
assertEquals(descName, desc.getName());
assertEquals(descArtifactId, desc.getArtifact().getId());
@@ -71,7 +70,6 @@ public class ContentPackageScannerTest {
assertEquals(desc.getBundles().get(0).getArtifact().getId().toString(),
"org.apache.felix:org.apache.felix.framework:jar:bundle:6.0.1");
assertEquals("artifact start order",20,
desc.getBundles().get(0).getArtifact().getStartOrder());
- assertEquals("bundle start level",20,
desc.getBundles().get(0).getBundleStartLevel());
assertEquals(1, desc.getConfigurations().size());
assertConfiguration(desc.getConfigurations().get(0));
