You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2022/06/14 16:17:12 UTC

[sling-org-apache-sling-scripting-bundle-tracker-it] branch test/rr created (now d00ce07)

This is an automated email from the ASF dual-hosted git repository.

pauls pushed a change to branch test/rr
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git


      at d00ce07  Test

This branch includes the following new commits:

     new d00ce07  Test

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[sling-org-apache-sling-scripting-bundle-tracker-it] 01/01: Test

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pauls pushed a commit to branch test/rr
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git

commit d00ce07cfb1ee8a12cb665cfca1826c30fe9be7a
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Tue Jun 14 18:17:01 2022 +0200

    Test
---
 it/pom.xml                            |  4 ++--
 it/src/test/provisioning/it-model.txt |  2 --
 it/src/test/provisioning/repoinit.txt |  7 +++++++
 it/src/test/provisioning/sling.txt    | 14 ++++++++++----
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/it/pom.xml b/it/pom.xml
index c869f9f..df90791 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -188,7 +188,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.servlets.resolver</artifactId>
-            <version>2.9.3-SNAPSHOT</version>
+            <version>2.9.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -206,7 +206,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.scripting.sightly</artifactId>
-            <version>1.4.14-1.4.0</version>
+            <version>1.4.18-1.4.0</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 b5b8288..cfa07c5 100644
--- a/it/src/test/provisioning/it-model.txt
+++ b/it/src/test/provisioning/it-model.txt
@@ -48,5 +48,3 @@
   org.apache.sling.engine.impl.SlingMainServlet
     sling.trace.allow=B"true"
 
-  org.apache.sling.servlets.resolver.SlingServletResolver
-    servletresolver.mountProviders=B"false"
diff --git a/it/src/test/provisioning/repoinit.txt b/it/src/test/provisioning/repoinit.txt
index b268d80..294a796 100644
--- a/it/src/test/provisioning/repoinit.txt
+++ b/it/src/test/provisioning/repoinit.txt
@@ -30,6 +30,13 @@
         allow   jcr:read	on /content
     end
 
+# SLING-9735 - Define service user and ACLs for jcr.contentloader >>>
+#<<< SLING-9809 - Define service user and ACLs for jcr.usermanager
+create service user sling-jcr-usermanager
+set ACL for sling-jcr-usermanager
+    allow jcr:read,jcr:readAccessControl,jcr:modifyAccessControl,rep:write,rep:userManagement on /home
+end
+
     # sling-mapping
     create service user sling-mapping
 
diff --git a/it/src/test/provisioning/sling.txt b/it/src/test/provisioning/sling.txt
index 5ebbbb0..06a2857 100644
--- a/it/src/test/provisioning/sling.txt
+++ b/it/src/test/provisioning/sling.txt
@@ -46,7 +46,7 @@
     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.24.0
+    org.apache.sling/org.apache.sling.api/2.25.0
     org.apache.sling/org.apache.sling.auth.core/1.4.6
     
 [artifacts startLevel=10]
@@ -70,7 +70,7 @@
     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.16
+    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 +98,7 @@
     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.8.0
+    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 +110,7 @@
     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.8.0
+    org.apache.sling/org.apache.sling.resourceresolver/1.9.1-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
@@ -217,6 +217,12 @@
       "org.apache.sling.jcr.resource:validation\=sling-readall"
     ]
 
+  org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr-usermanager
+     user.mapping=[
+                "org.apache.sling.jcr.jackrabbit.usermanager\=sling-jcr-usermanager"
+            ]
+        
+
   org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer-factories
     user.mapping=[
       "org.apache.sling.installer.factory.packages\=sling-package-install"