This is an automated email from the ASF dual-hosted git repository.
enorman pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter-content.git
The following commit(s) were added to refs/heads/master by this push:
new a95c935 SLING-12082 Migrate to jakarta.json (#8)
a95c935 is described below
commit a95c935cce81e30a62f308c705fe43803fa7f6f5
Author: Eric Norman <[email protected]>
AuthorDate: Thu Oct 19 17:20:30 2023 -0700
SLING-12082 Migrate to jakarta.json (#8)
* SLING-12112 Update to Sling Bundle Parent 52
---
pom.xml | 35 ++++++++++++++--------
.../apache/sling/starter/access/models/Ace.java | 19 ++++++------
.../apache/sling/starter/access/models/Acl.java | 4 +--
.../sling/starter/access/models/AceTest.java | 10 +++----
.../sling/starter/access/models/AclTest.java | 6 ++--
5 files changed, 42 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index 45bfc11..53171cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>47</version>
+ <version>52</version>
<relativePath />
</parent>
@@ -47,7 +47,7 @@
<frontend.target>target/frontend</frontend.target>
<project.build.outputTimestamp>1646405911</project.build.outputTimestamp>
<oak.version>1.16.0</oak.version>
- <junit-jupiter.version>5.9.1</junit-jupiter.version>
+ <junit-jupiter.version>5.10.0</junit-jupiter.version>
</properties>
<build>
@@ -141,28 +141,34 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.3_spec</artifactId>
<version>1.3</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.1_spec</artifactId>
- <version>1.5</version>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <version>2.1.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -180,6 +186,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.servlets.post</artifactId>
<version>2.5.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -197,16 +204,18 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-security-spi</artifactId>
<version>${oak.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.jackrabbit.accessmanager</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>4.8.1</version>
+ <version>5.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -221,18 +230,18 @@
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-core</artifactId>
- <version>1.2.19</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
<version>2.18.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.parsson</groupId>
+ <artifactId>parsson</artifactId>
+ <version>1.1.4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/src/main/java/org/apache/sling/starter/access/models/Ace.java
b/src/main/java/org/apache/sling/starter/access/models/Ace.java
index a50e90a..3d286c6 100644
--- a/src/main/java/org/apache/sling/starter/access/models/Ace.java
+++ b/src/main/java/org/apache/sling/starter/access/models/Ace.java
@@ -39,14 +39,14 @@ import javax.jcr.Session;
import javax.jcr.Workspace;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.Privilege;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonBuilderFactory;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonString;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonBuilderFactory;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonString;
+import jakarta.json.JsonValue;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.JackrabbitWorkspace;
@@ -317,7 +317,8 @@ public class Ace extends AccessFormPage {
/**
* Populate the restriction item list from data from a previously failed
POST request
- * @param list the list of restriction items
+ * @param allowMap map of allowed privileges to the list of restriction
items
+ * @param denyMap map of denied privileges to the list of restriction items
* @param srMap map where the key is the restriction name and the value is
the restriction definition
* @return map of field values that were found in the form context
*/
diff --git a/src/main/java/org/apache/sling/starter/access/models/Acl.java
b/src/main/java/org/apache/sling/starter/access/models/Acl.java
index 0bb4846..179a265 100644
--- a/src/main/java/org/apache/sling/starter/access/models/Acl.java
+++ b/src/main/java/org/apache/sling/starter/access/models/Acl.java
@@ -25,8 +25,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import javax.json.JsonObject;
-import javax.json.JsonValue;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
diff --git a/src/test/java/org/apache/sling/starter/access/models/AceTest.java
b/src/test/java/org/apache/sling/starter/access/models/AceTest.java
index 19b23d1..f5311c5 100644
--- a/src/test/java/org/apache/sling/starter/access/models/AceTest.java
+++ b/src/test/java/org/apache/sling/starter/access/models/AceTest.java
@@ -41,11 +41,11 @@ import javax.jcr.Session;
import javax.jcr.Workspace;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.Privilege;
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonValue;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.JackrabbitWorkspace;
diff --git a/src/test/java/org/apache/sling/starter/access/models/AclTest.java
b/src/test/java/org/apache/sling/starter/access/models/AclTest.java
index 4811339..891e5ef 100644
--- a/src/test/java/org/apache/sling/starter/access/models/AclTest.java
+++ b/src/test/java/org/apache/sling/starter/access/models/AclTest.java
@@ -28,9 +28,9 @@ import java.util.Map;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
