This is an automated email from the ASF dual-hosted git repository. joerghoh pushed a commit to branch SLING-12642-update-dependencies in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-repoinit.git
commit 9e1af2d82821000fe56bba5f2d231f2deb99ce31 Author: Joerg Hoh <[email protected]> AuthorDate: Wed Feb 5 14:06:15 2025 +0100 update dependencies - part 1 --- pom.xml | 13 +++++++++---- .../apache/sling/jcr/repoinit/it/RepoInitTestSupport.java | 6 +++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 7dbc140..bd313ed 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ <properties> <jackrabbit.version>2.18.2</jackrabbit.version> - <oak.version>1.22.10</oak.version> + <oak.version>1.44.0</oak.version> <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version> <!-- To debug the pax process, override this with -D --> <pax.vm.options>-Xmx512M</pax.vm.options> @@ -149,7 +149,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.sling-mock-oak</artifactId> - <version>3.0.0-1.16.0</version> + <version>3.1.10-1.44.0</version> <scope>test</scope> </dependency> <dependency> @@ -197,8 +197,8 @@ </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>provided</scope> </dependency> <dependency> @@ -261,6 +261,11 @@ <version>1.8.6</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jetbrains</groupId> + <artifactId>annotations</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> diff --git a/src/test/java/org/apache/sling/jcr/repoinit/it/RepoInitTestSupport.java b/src/test/java/org/apache/sling/jcr/repoinit/it/RepoInitTestSupport.java index 17ade35..73e04d8 100644 --- a/src/test/java/org/apache/sling/jcr/repoinit/it/RepoInitTestSupport.java +++ b/src/test/java/org/apache/sling/jcr/repoinit/it/RepoInitTestSupport.java @@ -55,7 +55,7 @@ public abstract class RepoInitTestSupport extends TestSupport { @Configuration public Option[] configuration() { - SlingOptions.versionResolver.setVersionFromProject("org.apache.jackrabbit", "jackrabbit-api"); + SlingOptions.versionResolver.setVersionFromProject("org.apache.jackrabbit", "oak-jackrabbit-api"); SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", "org.apache.sling.repoinit.parser"); SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", "org.apache.sling.commons.metrics"); SlingOptions.versionResolver.setVersionFromProject("org.apache.commons", "commons-lang3"); // for the metrics @@ -68,6 +68,10 @@ public abstract class RepoInitTestSupport extends TestSupport { .groupId("org.apache.sling") .artifactId("org.apache.sling.repoinit.parser") .versionAsInProject(), + mavenBundle() + .groupId("org.apache.jackrabbit") + .artifactId("oak-jackrabbit-api") + .versionAsInProject(), junitBundles(), awaitility(), newConfiguration("org.apache.sling.jcr.base.internal.LoginAdminWhitelist")
