You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by an...@apache.org on 2020/10/20 20:30:49 UTC
[sling-org-apache-sling-kickstart] branch master updated: Updated
the FMs of Sling 12
This is an automated email from the ASF dual-hosted git repository.
andysch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-kickstart.git
The following commit(s) were added to refs/heads/master by this push:
new 4e4ef57 Updated the FMs of Sling 12
4e4ef57 is described below
commit 4e4ef579bfda5568d302b98862c252265a572a39
Author: Andreas Schaefer <sc...@iMac.local>
AuthorDate: Tue Oct 20 13:30:32 2020 -0700
Updated the FMs of Sling 12
---
pom.xml | 6 +-
.../resources/features/app/slingshot-repoinit.txt | 39 ++++++++++
src/main/resources/features/app/slingshot.json | 25 +-----
src/main/resources/features/base-repoinit.txt | 74 ++++++++++++++++++
src/main/resources/features/base.json | 90 +++++-----------------
src/main/resources/features/boot.json | 4 +
src/main/resources/features/caconfig-repoinit.txt | 20 +++++
src/main/resources/features/caconfig.json | 6 +-
src/main/resources/features/discovery-repoinit.txt | 27 +++++++
src/main/resources/features/discovery.json | 17 +---
src/main/resources/features/event-repoinit.txt | 27 +++++++
src/main/resources/features/event.json | 15 +---
src/main/resources/features/oak/oak_base.json | 8 +-
src/main/resources/features/scripting.json | 66 ++++++++++------
src/main/resources/features/validation.json | 15 +---
15 files changed, 274 insertions(+), 165 deletions(-)
diff --git a/pom.xml b/pom.xml
index 42cc5de..e7e219f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,11 +40,11 @@
<properties>
<sling.java.version>8</sling.java.version>
- <sling-kickstart-maven-plugin.version>0.0.8</sling-kickstart-maven-plugin.version>
- <slingfeature-maven-plugin.version>1.3.14</slingfeature-maven-plugin.version>
+ <sling-kickstart-maven-plugin.version>0.0.9-SNAPSHOT</sling-kickstart-maven-plugin.version>
+ <slingfeature-maven-plugin.version>1.4.2</slingfeature-maven-plugin.version>
<picocli.version>4.5.1</picocli.version>
- <org.apache.sling.feature.launcher.version>1.1.4</org.apache.sling.feature.launcher.version>
+ <org.apache.sling.feature.launcher.version>1.1.6</org.apache.sling.feature.launcher.version>
<org.apache.sling.feature.extension.content.version>1.0.6</org.apache.sling.feature.extension.content.version>
<org.apache.felix.framework.version>6.0.3</org.apache.felix.framework.version>
<commons-io.version>2.6</commons-io.version>
diff --git a/src/main/resources/features/app/slingshot-repoinit.txt b/src/main/resources/features/app/slingshot-repoinit.txt
new file mode 100644
index 0000000..a93116b
--- /dev/null
+++ b/src/main/resources/features/app/slingshot-repoinit.txt
@@ -0,0 +1,39 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+create service user slingshot-service with path system/sling
+create user slingshot1 with password slingshot1
+create user slingshot2 with password slingshot2
+
+create path (sling:Folder) /content/slingshot
+create path (sling:Folder) /content/slingshot/users
+create path (sling:Folder) /content/slingshot/users/slingshot1
+create path (sling:Folder) /content/slingshot/users/slingshot2
+
+set principal ACL for slingshot-service
+ allow jcr:read,rep:write on /content/slingshot
+end
+
+set ACL for slingshot1
+ allow jcr:read,rep:write on /content/slingshot/users/slingshot1
+end
+
+set ACL for slingshot2
+ allow jcr:read,rep:write on /content/slingshot/users/slingshot2
+end
\ No newline at end of file
diff --git a/src/main/resources/features/app/slingshot.json b/src/main/resources/features/app/slingshot.json
index 62350eb..e55a673 100644
--- a/src/main/resources/features/app/slingshot.json
+++ b/src/main/resources/features/app/slingshot.json
@@ -9,30 +9,9 @@
"configurations":{
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling.slingshot":{
"user.mapping":[
- "org.apache.sling.sample.slingshot=slingshot-service"
+ "org.apache.sling.sample.slingshot=[slingshot-service]"
]
}
},
- "repoinit:TEXT|true":[
- "create service user slingshot-service",
- "create user slingshot1 with password slingshot1",
- "create user slingshot2 with password slingshot2",
- "",
- "create path (sling:Folder) /content/slingshot",
- "create path (sling:Folder) /content/slingshot/users",
- "create path (sling:Folder) /content/slingshot/users/slingshot1",
- "create path (sling:Folder) /content/slingshot/users/slingshot2",
- "",
- "set ACL for slingshot-service",
- "allow jcr:read,rep:write on /content/slingshot",
- "end",
- "",
- "set ACL for slingshot1",
- "allow jcr:read,rep:write on /content/slingshot/users/slingshot1",
- "end",
- "",
- "set ACL for slingshot2",
- "allow jcr:read,rep:write on /content/slingshot/users/slingshot2",
- "end"
- ]
+ "repoinit:TEXT|true": "@file"
}
\ No newline at end of file
diff --git a/src/main/resources/features/base-repoinit.txt b/src/main/resources/features/base-repoinit.txt
new file mode 100644
index 0000000..c9b417e
--- /dev/null
+++ b/src/main/resources/features/base-repoinit.txt
@@ -0,0 +1,74 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# general
+create path (sling:OrderedFolder) /content
+set ACL for everyone
+ allow jcr:read on /content
+end
+
+# sling-readall
+create service user sling-readall with path system/sling
+
+set principal ACL for sling-readall
+ allow jcr:read on /
+end
+
+# sling-xss
+create service user sling-xss with path system/sling
+
+create path (sling:Folder) /apps/sling/xss
+
+set principal ACL for sling-xss
+ allow jcr:read on /apps/sling/xss
+end
+
+# sling-jcr-install
+create service user sling-jcr-install with path system/sling
+
+# used for config OSGi writeback
+create path (sling:Folder) /apps/sling/install
+
+set principal ACL for sling-jcr-install
+ allow rep:write on /apps/sling/install
+end
+
+# content-package installer
+create service user sling-package-install with path system/sling
+
+set principal ACL for sling-package-install
+ allow jcr:all on /
+ allow jcr:namespaceManagement,jcr:nodeTypeDefinitionManagement on :repository
+end
+#<<< SLING-5848 - Define service user and ACLs for Scripting
+create service user sling-search-path-reader with path system/sling
+
+create path (sling:Folder) /libs
+create path (sling:Folder) /apps
+
+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-9809 - Define service user and ACLs for jcr.usermanager
+create service user sling-jcr-usermanager with path system/sling
+set ACL for sling-jcr-usermanager
+ allow jcr:read,jcr:readAccessControl,jcr:modifyAccessControl,rep:write,rep:userManagement on /home
+end
+# SLING-9809 - Define service user and ACLs for jcr.usermanager >>>
diff --git a/src/main/resources/features/base.json b/src/main/resources/features/base.json
index 4537744..7a68ae9 100644
--- a/src/main/resources/features/base.json
+++ b/src/main/resources/features/base.json
@@ -114,7 +114,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.servlets.resolver:2.7.8",
+ "id":"org.apache.sling:org.apache.sling.servlets.resolver:2.7.10",
"start-order":"20"
},
{
@@ -170,7 +170,7 @@
"start-order":"5"
},
{
- "id":"org.apache.sling:org.apache.sling.api:2.22.0",
+ "id":"org.apache.sling:org.apache.sling.api:2.23.0",
"start-order":"5"
},
{
@@ -286,103 +286,53 @@
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~i18n":{
"user.mapping":[
- "org.apache.sling.i18n=sling-i18n"
+ "org.apache.sling.i18n=[sling-readall]"
]
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~installer-factories":{
"user.mapping":[
- "org.apache.sling.installer.factory.packages=sling-package-install"
+ "org.apache.sling.installer.factory.packages=[sling-package-install]"
]
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~jcr-install":{
"user.mapping":[
- "org.apache.sling.installer.provider.jcr=sling-jcr-install"
+ "org.apache.sling.installer.provider.jcr=[sling-readall,sling-jcr-install]"
]
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~jcr-resource":{
"user.mapping":[
- "org.apache.sling.jcr.resource:validation=sling-readall"
+ "org.apache.sling.jcr.resource:validation=[sling-readall]"
]
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~observation":{
"user.mapping":[
- "org.apache.sling.jcr.resource:observation=sling-readall"
+ "org.apache.sling.jcr.resource:observation=[sling-readall]"
]
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~resourceresolver":{
"user.mapping":[
- "org.apache.sling.resourceresolver:mapping=sling-mapping",
- "org.apache.sling.resourceresolver:hierarchy=sling-readall",
- "org.apache.sling.resourceresolver:observation=sling-readall",
- "org.apache.sling.resourceresolver:console=sling-readall"
+ "org.apache.sling.resourceresolver:mapping=[sling-readall]",
+ "org.apache.sling.resourceresolver:hierarchy=[sling-readall]",
+ "org.apache.sling.resourceresolver:observation=[sling-readall]",
+ "org.apache.sling.resourceresolver:console=[sling-readall]"
]
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~servletsresolver":{
"user.mapping":[
- "org.apache.sling.servlets.resolver:console=sling-readall",
- "org.apache.sling.servlets.resolver:scripts=sling-scripting"
+ "org.apache.sling.servlets.resolver:console=[sling-readall]",
+ "org.apache.sling.servlets.resolver:scripts=[sling-search-path-reader]"
]
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~xss":{
"user.mapping":[
- "org.apache.sling.xss=sling-xss"
+ "org.apache.sling.xss=[sling-xss]"
+ ]
+ },
+ "org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~jcr-usermanager":{
+ "user.mapping":[
+ "org.apache.sling.jcr.jackrabbit.usermanager=[sling-jcr-usermanager]"
]
}
},
- "repoinit:TEXT|true":[
- "# general",
- "create path (sling:OrderedFolder) /content",
- "set ACL for everyone",
- "allow jcr:read on /content",
- "end",
- "",
- "# sling-mapping",
- "create service user sling-mapping",
- "",
- "set ACL for sling-mapping",
- "allow jcr:read on /",
- "end",
- "",
- "# sling-readall",
- "create service user sling-readall",
- "",
- "set ACL for sling-readall",
- "allow jcr:read on /",
- "end",
- "",
- "# sling-xss",
- "create service user sling-xss",
- "",
- "create path (sling:Folder) /apps/sling/xss",
- "",
- "set ACL for sling-xss",
- "allow jcr:read on /apps/sling/xss",
- "end",
- "",
- "# sling-i18n",
- "create service user sling-i18n",
- "",
- "set ACL for sling-i18n",
- "allow jcr:read on /",
- "end",
- "",
- "# sling-jcr-install",
- "create service user sling-jcr-install",
- "",
- "# used for config OSGi writeback",
- "create path (sling:Folder) /apps/sling/install",
- "",
- "set ACL for sling-jcr-install",
- "allow jcr:read on /",
- "allow rep:write on /apps/sling/install",
- "end",
- "",
- "# content-package installer",
- "create service user sling-package-install",
- "",
- "set ACL for sling-package-install",
- "allow jcr:all on /",
- "allow jcr:namespaceManagement,jcr:nodeTypeDefinitionManagement on :repository",
- "end"
- ]
+ "repoinit:TEXT|true":"@file"
}
diff --git a/src/main/resources/features/boot.json b/src/main/resources/features/boot.json
index ca0c4ae..c1f1a0d 100644
--- a/src/main/resources/features/boot.json
+++ b/src/main/resources/features/boot.json
@@ -69,6 +69,10 @@
"start-order":"1"
},
{
+ "id":"org.apache.felix:org.apache.felix.log:1.2.4",
+ "start-order":"1"
+ },
+ {
"id":"org.apache.sling:org.apache.sling.commons.osgi:2.4.0",
"start-order":"1"
},
diff --git a/src/main/resources/features/caconfig-repoinit.txt b/src/main/resources/features/caconfig-repoinit.txt
new file mode 100644
index 0000000..db8d2a5
--- /dev/null
+++ b/src/main/resources/features/caconfig-repoinit.txt
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+create path (sling:Folder) /conf
\ No newline at end of file
diff --git a/src/main/resources/features/caconfig.json b/src/main/resources/features/caconfig.json
index 36ac153..5d9aef7 100644
--- a/src/main/resources/features/caconfig.json
+++ b/src/main/resources/features/caconfig.json
@@ -17,11 +17,9 @@
"configurations":{
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-caconfig":{
"user.mapping":[
- "org.apache.sling.caconfig.impl=sling-readall"
+ "org.apache.sling.caconfig.impl=[sling-readall]"
]
}
},
- "repoinit:TEXT|true":[
- "create path (sling:Folder) /conf"
- ]
+ "repoinit:TEXT|true": "@file"
}
\ No newline at end of file
diff --git a/src/main/resources/features/discovery-repoinit.txt b/src/main/resources/features/discovery-repoinit.txt
new file mode 100644
index 0000000..17b5f0f
--- /dev/null
+++ b/src/main/resources/features/discovery-repoinit.txt
@@ -0,0 +1,27 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+create service user sling-discovery with path system/sling
+
+create path (sling:Folder) /var/discovery
+create path (sling:Folder) /var/discovery/oak
+
+set principal ACL for sling-discovery
+ allow jcr:read,rep:write on /var/discovery
+end
\ No newline at end of file
diff --git a/src/main/resources/features/discovery.json b/src/main/resources/features/discovery.json
index 52bf85f..76eadfa 100644
--- a/src/main/resources/features/discovery.json
+++ b/src/main/resources/features/discovery.json
@@ -25,20 +25,11 @@
"configurations":{
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling.discovery":{
"user.mapping":[
- "org.apache.sling.discovery.commons=sling-discovery",
- "org.apache.sling.discovery.base=sling-discovery",
- "org.apache.sling.discovery.oak=sling-discovery"
+ "org.apache.sling.discovery.commons=[sling-discovery]",
+ "org.apache.sling.discovery.base=[sling-discovery]",
+ "org.apache.sling.discovery.oak=[sling-discovery]"
]
}
},
- "repoinit:TEXT|true":[
- "create service user sling-discovery",
- "",
- "create path (sling:Folder) /var/discovery",
- "create path (sling:Folder) /var/discovery/oak",
- "",
- "set ACL for sling-discovery",
- "allow jcr:read,rep:write on /var/discovery",
- "end"
- ]
+ "repoinit:TEXT|true": "@file"
}
\ No newline at end of file
diff --git a/src/main/resources/features/event-repoinit.txt b/src/main/resources/features/event-repoinit.txt
new file mode 100644
index 0000000..7ad7244
--- /dev/null
+++ b/src/main/resources/features/event-repoinit.txt
@@ -0,0 +1,27 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+create service user sling-event with path system/sling
+
+create path (sling:Folder) /var
+create path (sling:Folder) /var/eventing
+
+set principal ACL for sling-event
+ allow jcr:read,rep:write on /var/eventing
+end
\ No newline at end of file
diff --git a/src/main/resources/features/event.json b/src/main/resources/features/event.json
index 2d96d7d..19d17d7 100644
--- a/src/main/resources/features/event.json
+++ b/src/main/resources/features/event.json
@@ -13,19 +13,10 @@
"configurations":{
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling.event":{
"user.mapping":[
- "org.apache.sling.event=sling-event",
- "org.apache.sling.event.dea=sling-event"
+ "org.apache.sling.event=[sling-event]",
+ "org.apache.sling.event.dea=[sling-event]"
]
}
},
- "repoinit:TEXT|true":[
- "create service user sling-event",
- "",
- "create path (sling:Folder) /var",
- "create path (sling:Folder) /var/eventing",
- "",
- "set ACL for sling-event",
- "allow jcr:read,rep:write on /var/eventing",
- "end"
- ]
+ "repoinit:TEXT|true": "@file"
}
\ No newline at end of file
diff --git a/src/main/resources/features/oak/oak_base.json b/src/main/resources/features/oak/oak_base.json
index 307ef21..5e61a7c 100644
--- a/src/main/resources/features/oak/oak_base.json
+++ b/src/main/resources/features/oak/oak_base.json
@@ -98,7 +98,7 @@
"start-order":"15"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.base:3.1.4",
+ "id":"org.apache.sling:org.apache.sling.jcr.base:3.1.6",
"start-order":"15"
},
{
@@ -118,7 +118,7 @@
"start-order":"15"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.oak.server:1.2.6",
+ "id":"org.apache.sling:org.apache.sling.jcr.oak.server:1.2.8",
"start-order":"16"
},
{
@@ -138,11 +138,11 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager:3.0.6",
+ "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager:3.0.8",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager:2.2.10",
+ "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager:2.2.12",
"start-order":"20"
}
],
diff --git a/src/main/resources/features/scripting.json b/src/main/resources/features/scripting.json
index 45c4205..210b145 100644
--- a/src/main/resources/features/scripting.json
+++ b/src/main/resources/features/scripting.json
@@ -14,7 +14,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.core:2.3.2",
+ "id":"org.apache.sling:org.apache.sling.scripting.core:2.3.4",
"start-order":"20"
},
{
@@ -22,7 +22,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.javascript:3.1.2",
+ "id":"org.apache.sling:org.apache.sling.scripting.javascript:3.1.4",
"start-order":"20"
},
{
@@ -38,15 +38,15 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.sightly.compiler.java:1.2.0-1.4.0",
+ "id":"org.apache.sling:org.apache.sling.scripting.sightly.compiler.java:1.2.2-1.4.0",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.sightly.compiler:1.2.6-1.4.0",
+ "id":"org.apache.sling:org.apache.sling.scripting.sightly.compiler:1.2.8-1.4.0",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.sightly.js.provider:1.2.0",
+ "id":"org.apache.sling:org.apache.sling.scripting.sightly.js.provider:1.2.6",
"start-order":"20"
},
{
@@ -54,11 +54,43 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.sightly.runtime:1.2.2-1.4.0",
+ "id":"org.apache.sling:org.apache.sling.scripting.sightly.runtime:1.2.4-1.4.0",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.sightly:1.4.2-1.4.0",
+ "id":"org.apache.sling:org.apache.sling.scripting.sightly:1.4.4-1.4.0",
+ "start-order":"20"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.scripting.freemarker:1.0.4",
+ "start-order":"20"
+ },
+ {
+ "id": "org.freemarker:freemarker:2.3.30",
+ "start-order": "20"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.scripting.thymeleaf:2.0.2",
+ "start-order":"20"
+ },
+ {
+ "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.thymeleaf:3.0.11.RELEASE_1",
+ "start-order":"20"
+ },
+ {
+ "id":"org.attoparser:attoparser:2.0.5.RELEASE",
+ "start-order":"20"
+ },
+ {
+ "id":"org.unbescape:unbescape:1.1.6.RELEASE",
+ "start-order":"20"
+ },
+ {
+ "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl:3.2.1_1",
+ "start-order":"20"
+ },
+ {
+ "id":"org.javassist:javassist:3.27.0-GA",
"start-order":"20"
}
],
@@ -70,22 +102,10 @@
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~scripting":{
"user.mapping":[
- "org.apache.sling.scripting.core=sling-scripting",
- "org.apache.sling.scripting.sightly.js.provider=sling-scripting"
+ "org.apache.sling.scripting.core=[sling-search-path-reader]",
+ "org.apache.sling.scripting.sightly.js.provider=[sling-search-path-reader]",
+ "org.apache.sling.scripting.thymeleaf=[sling-search-path-reader]"
]
}
- },
- "repoinit:TEXT|true":[
- "#<<< SLING-5848 - Define service user and ACLs for Scripting",
- "create service user sling-scripting",
- "",
- "create path (sling:Folder) /libs",
- "create path (sling:Folder) /apps",
- "",
- "set ACL for sling-scripting",
- "deny jcr:all on /",
- "allow jcr:read on /libs,/apps",
- "end",
- "# SLING-5848 - Define service user and ACLs for Scripting >>>"
- ]
+ }
}
diff --git a/src/main/resources/features/validation.json b/src/main/resources/features/validation.json
index 4fac69a..d9598e5 100644
--- a/src/main/resources/features/validation.json
+++ b/src/main/resources/features/validation.json
@@ -17,19 +17,8 @@
"configurations":{
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~validation":{
"user.mapping":[
- "org.apache.sling.validation.core=sling-validation"
+ "org.apache.sling.validation.core=[sling-search-path-reader]"
]
}
- },
- "repoinit:TEXT|true":[
- "create service user sling-validation",
- "",
- "create path (sling:Folder) /apps",
- "create path (sling:Folder) /libs",
- "",
- "set ACL for sling-validation",
- "allow jcr:read on /apps",
- "allow jcr:read on /libs",
- "end"
- ]
+ }
}
\ No newline at end of file