You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by en...@apache.org on 2020/11/27 21:15:29 UTC
[sling-org-apache-sling-starter] branch master updated: Add
sling-jcr-contentloader service user and switch to 2.4.0 release of
org.apache.sling.jcr.contentloader
This is an automated email from the ASF dual-hosted git repository.
enorman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
The following commit(s) were added to refs/heads/master by this push:
new bbfcdfb Add sling-jcr-contentloader service user and switch to 2.4.0 release of org.apache.sling.jcr.contentloader
bbfcdfb is described below
commit bbfcdfb51bb64703c5afce63e66713c06f622230
Author: Eric Norman <en...@apache.org>
AuthorDate: Fri Nov 27 13:15:15 2020 -0800
Add sling-jcr-contentloader service user and switch to 2.4.0 release of
org.apache.sling.jcr.contentloader
---
src/main/features/base-repoinit.txt | 6 ++++++
src/main/features/base.json | 5 +++++
src/main/features/oak/oak_base.json | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/main/features/base-repoinit.txt b/src/main/features/base-repoinit.txt
index 6751f6a..dc4a7e8 100644
--- a/src/main/features/base-repoinit.txt
+++ b/src/main/features/base-repoinit.txt
@@ -66,6 +66,12 @@ set principal ACL for sling-search-path-reader
allow jcr:read on /libs,/apps
end
# SLING-5848 - Define service user and ACLs for Scripting >>>
+#<<< SLING-9735 - Define service user and ACLs for jcr.contentloader
+create service user sling-jcr-content-loader with path system/sling
+set principal ACL for sling-jcr-content-loader
+ allow jcr:all on /
+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 with path system/sling
set principal ACL for sling-jcr-usermanager
diff --git a/src/main/features/base.json b/src/main/features/base.json
index 2614f12..480c1f5 100644
--- a/src/main/features/base.json
+++ b/src/main/features/base.json
@@ -332,6 +332,11 @@
"user.mapping":[
"org.apache.sling.jcr.jackrabbit.usermanager=[sling-jcr-usermanager]"
]
+ },
+ "org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~jcr-contentloader":{
+ "user.mapping":[
+ "org.apache.sling.jcr.contentloader=[sling-jcr-content-loader]"
+ ]
}
},
"repoinit:TEXT|true":"@file"
diff --git a/src/main/features/oak/oak_base.json b/src/main/features/oak/oak_base.json
index 1d4ea84..ccdb740 100644
--- a/src/main/features/oak/oak_base.json
+++ b/src/main/features/oak/oak_base.json
@@ -134,7 +134,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.contentloader:2.3.0",
+ "id":"org.apache.sling:org.apache.sling.jcr.contentloader:2.4.0",
"start-order":"20"
},
{