SLING-11508 - Make dependency resolution use ResourceResolver#getResource instead of ResourceResolver#resolve
* updated dependencies
diff --git a/examples/org-apache-sling-scripting-examplebundle-precompiled-jsp/pom.xml b/examples/org-apache-sling-scripting-examplebundle-precompiled-jsp/pom.xml
index 41c73c7..f443e0a 100644
--- a/examples/org-apache-sling-scripting-examplebundle-precompiled-jsp/pom.xml
+++ b/examples/org-apache-sling-scripting-examplebundle-precompiled-jsp/pom.xml
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.22.0</version>
+ <version>2.26.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/it/pom.xml b/it/pom.xml
index 4cfa48e..57428f2 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -175,6 +175,24 @@
<dependencies>
<dependency>
<groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.26.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.engine</artifactId>
+ <version>2.10.3-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.resourceresolver</artifactId>
+ <version>1.10.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.spi</artifactId>
<version>1.0.2</version>
<scope>test</scope>
@@ -188,7 +206,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.servlets.resolver</artifactId>
- <version>2.9.7-SNAPSHOT</version>
+ <version>2.9.9-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -206,7 +224,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly</artifactId>
- <version>1.4.19-1.4.0-SNAPSHOT</version>
+ <version>1.4.21-1.4.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -230,7 +248,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly.js.provider</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.9-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/it/src/test/provisioning/it-model.txt b/it/src/test/provisioning/it-model.txt
index cfa07c5..5752ae3 100644
--- a/it/src/test/provisioning/it-model.txt
+++ b/it/src/test/provisioning/it-model.txt
@@ -21,6 +21,9 @@
# Dependencies
[artifacts]
+ org.apache.sling/org.apache.sling.api
+ org.apache.sling/org.apache.sling.resourceresolver
+ org.apache.sling/org.apache.sling.engine
org.apache.sling/org.apache.sling.scripting.spi
org.apache.sling/org.apache.sling.servlets.resolver
org.apache.sling/org.apache.sling.scripting.core
diff --git a/it/src/test/provisioning/sling.txt b/it/src/test/provisioning/sling.txt
index 63e8b76..129747a 100644
--- a/it/src/test/provisioning/sling.txt
+++ b/it/src/test/provisioning/sling.txt
@@ -46,7 +46,6 @@
commons-io/commons-io/2.6
commons-fileupload/commons-fileupload/1.4
org.apache.sling/org.apache.sling.commons.log.webconsole/1.0.0
- org.apache.sling/org.apache.sling.api/2.26.0-SNAPSHOT
org.apache.sling/org.apache.sling.auth.core/1.4.6
[artifacts startLevel=10]
@@ -70,7 +69,6 @@
org.apache.jackrabbit/jackrabbit-data/${jackrabbit.version}
org.apache.sling/org.apache.sling.jcr.webdav/2.3.8
org.apache.sling/org.apache.sling.jcr.davex/1.3.10
- org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.22
org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/3.0.4
org.apache.sling/org.apache.sling.jcr.webconsole/1.0.2
io.dropwizard.metrics/metrics-core/3.2.6
@@ -98,7 +96,6 @@
org.apache.sling/org.apache.sling.commons.mime/2.2.2
org.apache.sling/org.apache.sling.commons.scheduler/2.7.6
org.apache.sling/org.apache.sling.commons.threads/3.2.20
- org.apache.sling/org.apache.sling.engine/2.9.0
org.apache.sling/org.apache.sling.fsresource/2.1.16
org.apache.sling/org.apache.sling.i18n/2.5.14
org.apache.sling/org.apache.sling.installer.console/1.1.0
@@ -110,7 +107,6 @@
org.apache.sling/org.apache.sling.jcr.resource/3.1.0
org.apache.sling/org.apache.sling.models.api/1.3.8
org.apache.sling/org.apache.sling.models.impl/1.4.12
- org.apache.sling/org.apache.sling.resourceresolver/1.10.0-SNAPSHOT
org.apache.sling/org.apache.sling.serviceusermapper/1.4.4
org.apache.sling/org.apache.sling.serviceuser.webconsole/1.0.2
org.apache.sling/org.apache.sling.servlets.get/2.1.40
