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 2022/03/22 17:00:56 UTC

[sling-org-apache-sling-scripting-sightly-testing] branch master updated: SLING-11210 - Use SlingUriBuilder

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-scripting-sightly-testing.git


The following commit(s) were added to refs/heads/master by this push:
     new 086685a  SLING-11210 - Use SlingUriBuilder
086685a is described below

commit 086685aab6e2e34f93993b7846d871bee502285c
Author: Radu Cotescu <17...@users.noreply.github.com>
AuthorDate: Tue Mar 22 18:00:52 2022 +0100

    SLING-11210 - Use SlingUriBuilder
    
    * updated IT setup to allow test execution
    * remove the Jackrabbit User Manager - not yet compatible with the new Sling API and it's also not required for the IT
---
 pom.xml                         | 8 ++++----
 src/test/provisioning/sling.txt | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1c8bfc6..8d802f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,7 +264,7 @@ Require-Capability: osgi.extender;filter:="(&(osgi.extender=sling.scripting)(ver
                         <launchpad.http.port>${http.port}</launchpad.http.port>
                         <launchpad.http.server.url>http://${test.host}:${http.port}</launchpad.http.server.url>
                         <launchpad.servlet.context>${http.base.path}</launchpad.servlet.context>
-                        <IT.expected.bundles.count>178</IT.expected.bundles.count>
+                        <IT.expected.bundles.count>177</IT.expected.bundles.count>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
@@ -318,7 +318,7 @@ Require-Capability: osgi.extender;filter:="(&(osgi.extender=sling.scripting)(ver
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.22.0</version>
+            <version>2.25.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -390,7 +390,7 @@ Require-Capability: osgi.extender;filter:="(&(osgi.extender=sling.scripting)(ver
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.scripting.sightly</artifactId>
-            <version>1.4.12-1.4.0</version>
+            <version>1.4.17-1.4.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -421,7 +421,7 @@ Require-Capability: osgi.extender;filter:="(&(osgi.extender=sling.scripting)(ver
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.servlets.resolver</artifactId>
-            <version>2.8.0</version>
+            <version>2.9.3-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/src/test/provisioning/sling.txt b/src/test/provisioning/sling.txt
index d304a85..01b18fc 100644
--- a/src/test/provisioning/sling.txt
+++ b/src/test/provisioning/sling.txt
@@ -48,7 +48,7 @@
     commons-io/commons-io/2.6
     commons-fileupload/commons-fileupload/1.3.3
     org.apache.sling/org.apache.sling.commons.log.webconsole/1.0.0
-    org.apache.sling/org.apache.sling.api/2.23.6
+    org.apache.sling/org.apache.sling.api
     org.apache.sling/org.apache.sling.auth.core/1.4.4
     
 [artifacts startLevel=10]
@@ -73,7 +73,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.8
     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
@@ -113,7 +112,7 @@
     org.apache.sling/org.apache.sling.jcr.resource/3.0.20
     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.6.16
+    org.apache.sling/org.apache.sling.resourceresolver/1.8.4
     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