This is an automated email from the ASF dual-hosted git repository.
apelluru pushed a commit to branch SLING-12067
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-testing.git
The following commit(s) were added to refs/heads/SLING-12067 by this push:
new 654f3ec SLING-12067: migrate to jakarta.json
654f3ec is described below
commit 654f3ecb133e687804994bc71624d095bd0c0535
Author: Ashok Pelluru <[email protected]>
AuthorDate: Wed Oct 4 03:25:15 2023 +0200
SLING-12067: migrate to jakarta.json
---
pom.xml | 44 +++++++++++++++++++++++++++++---------------
1 file changed, 29 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index e4f4920..f1d5c6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>47</version>
+ <version>52</version>
<relativePath />
</parent>
@@ -37,8 +37,8 @@
</description>
<properties>
- <project.build.outputTimestamp>1</project.build.outputTimestamp>
- <jackrabbit.version>2.14.3</jackrabbit.version>
+ <jackrabbit.version>2.20.2</jackrabbit.version>
+ <oak.version>1.44.0</oak.version>
</properties>
<scm>
@@ -49,20 +49,28 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
+ <version>1.9.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>7.0.0</version>
+ <artifactId>org.osgi.service.component</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <version>7.0.0</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <version>2.0.2</version>
+ <scope>provided</scope>
</dependency>
-
<!--
Dependencies required for testing and provided
transitively to modules using this artifact
@@ -82,13 +90,12 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <version>2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- <version>${jackrabbit.version}</version>
+ <artifactId>oak-jackrabbit-api</artifactId>
+ <version>${oak.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -157,7 +164,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>compile</scope>
+ <version>4.13.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>5.5.0</version>
+ <scope>test</scope>
</dependency>
<!-- Provide for Test Mocks -->