You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2021/10/27 15:39:16 UTC
[sling-org-apache-sling-jcr-jackrabbit-usermanager] branch master
updated: SLING-10890 - Make the Jackrabbit User Manager compatible with API
2.24.0
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-jackrabbit-usermanager.git
The following commit(s) were added to refs/heads/master by this push:
new 051e4e9 SLING-10890 - Make the Jackrabbit User Manager compatible with API 2.24.0
051e4e9 is described below
commit 051e4e932eddc39168002081629d893c4deb1601
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Wed Oct 27 17:39:01 2021 +0200
SLING-10890 - Make the Jackrabbit User Manager compatible with API 2.24.0
---
pom.xml | 2 +-
.../jcr/jackrabbit/usermanager/it/UserManagerTestSupport.java | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index ced9da4..5ea3306 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.23.4</version>
+ <version>2.23.7-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/UserManagerTestSupport.java b/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/UserManagerTestSupport.java
index 8991c27..b2996ad 100644
--- a/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/UserManagerTestSupport.java
+++ b/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/UserManagerTestSupport.java
@@ -128,10 +128,11 @@ public abstract class UserManagerTestSupport extends TestSupport {
// newer version of sling.api and dependencies for SLING-10034
// may remove at a later date if the superclass includes these versions or later
versionResolver.setVersionFromProject("org.apache.sling", "org.apache.sling.api");
- versionResolver.setVersion("org.apache.sling", "org.apache.sling.resourceresolver", "1.7.0"); // to be compatible with current o.a.sling.api
- versionResolver.setVersion("org.apache.sling", "org.apache.sling.scripting.core", "2.3.4"); // to be compatible with current o.a.sling.api
+ versionResolver.setVersion("org.apache.sling", "org.apache.sling.engine", "2.7.10"); // to be compatible with current o.a.sling.api
+ versionResolver.setVersion("org.apache.sling", "org.apache.sling.resourceresolver", "1.7.10"); // to be compatible with current o.a.sling.api
+ versionResolver.setVersion("org.apache.sling", "org.apache.sling.scripting.core", "2.4.0"); // to be compatible with current o.a.sling.api
versionResolver.setVersion("org.apache.sling", "org.apache.sling.scripting.api", "2.2.0"); // to be compatible with current o.a.sling.api
- versionResolver.setVersion("org.apache.sling", "org.apache.sling.servlets.resolver", "2.7.12"); // to be compatible with current o.a.sling.api
+ versionResolver.setVersion("org.apache.sling", "org.apache.sling.servlets.resolver", "2.8.3-SNAPSHOT"); // to be compatible with current o.a.sling.api
versionResolver.setVersion("org.apache.sling", "org.apache.sling.commons.compiler", "2.4.0"); // to be compatible with current o.a.sling.scripting.core
return composite(
@@ -163,7 +164,9 @@ public abstract class UserManagerTestSupport extends TestSupport {
// needed by latest version of org.apache.sling.api
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.converter").version("1.0.14"),
// needed by latest version of org.apache.sling.scripting.core
- slingCommonsCompiler()
+ slingCommonsCompiler(),
+ mavenBundle("org.apache.sling", "org.apache.sling.scripting.spi", "1.0.2"),
+ mavenBundle("org.apache.sling", "org.apache.sling.commons.johnzon", "1.2.6")
).add(
additionalOptions()
).remove(