You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2020/08/17 22:18:34 UTC
[sling-org-apache-sling-starter] branch master updated (654da5d ->
fa59e60)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git.
from 654da5d SLING-9636 - Refine feature model files
new b9a8ba2 SLING-9636 - Refine feature model files
new 6a8d613 SLING-9636 - Refine feature model files
new 6c965cb SLING-9636 - Refine feature model files
new fa59e60 SLING-9636 - Refine feature model files
The 4 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.
Summary of changes:
src/main/features/base.json | 135 ++-------------------
src/main/features/healthcheck.json | 4 -
src/main/features/oak.json | 64 ++++++++++
.../persistence/oak_persistence_mongods.json | 6 +-
.../features/persistence/oak_persistence_sns.json | 2 +-
src/main/features/webconsole.json | 62 ++++++++++
6 files changed, 141 insertions(+), 132 deletions(-)
create mode 100644 src/main/features/webconsole.json
[sling-org-apache-sling-starter] 01/04: SLING-9636 - Refine feature
model files
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit b9a8ba2f42cd16238e95b4c65df1d186ba2b1daa
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Aug 17 23:18:06 2020 +0200
SLING-9636 - Refine feature model files
Remove duplicate scr bundle
---
src/main/features/base.json | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/main/features/base.json b/src/main/features/base.json
index 10ddf35..8eeb46e 100644
--- a/src/main/features/base.json
+++ b/src/main/features/base.json
@@ -154,10 +154,6 @@
"start-order":"4"
},
{
- "id":"org.apache.felix:org.apache.felix.scr:2.1.20",
- "start-order":"4"
- },
- {
"id":"commons-fileupload:commons-fileupload:1.4",
"start-order":"5"
},
[sling-org-apache-sling-starter] 04/04: SLING-9636 - Refine feature
model files
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit fa59e60cde994c04bbbf9429b8e1b06bcf2ec378
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Aug 17 23:41:04 2020 +0200
SLING-9636 - Refine feature model files
Move JCR related bundles to the oak feature
---
src/main/features/base.json | 74 ++--------------------
src/main/features/oak.json | 64 +++++++++++++++++++
.../persistence/oak_persistence_mongods.json | 6 +-
.../features/persistence/oak_persistence_sns.json | 2 +-
4 files changed, 74 insertions(+), 72 deletions(-)
diff --git a/src/main/features/base.json b/src/main/features/base.json
index 34c203b..9a07520 100644
--- a/src/main/features/base.json
+++ b/src/main/features/base.json
@@ -34,10 +34,6 @@
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit.vault:org.apache.jackrabbit.vault:3.4.4",
- "start-order":"20"
- },
- {
"id":"org.apache.sling:org.apache.sling.adapter:2.1.10",
"start-order":"20"
},
@@ -97,14 +93,7 @@
"id":"org.apache.sling:org.apache.sling.installer.hc:2.0.2",
"start-order":"20"
},
- {
- "id":"org.apache.sling:org.apache.sling.installer.provider.jcr:3.3.0",
- "start-order":"20"
- },
- {
- "id":"org.apache.sling:org.apache.sling.jcr.contentloader:2.3.0",
- "start-order":"20"
- },
+
{
"id":"org.apache.sling:org.apache.sling.jcr.resource:3.0.22",
"start-order":"20"
@@ -230,53 +219,14 @@
"start-order":"10"
},
{
- "id":"com.google.guava:guava:15.0",
- "start-order":"15"
- },
- {
"id":"io.dropwizard.metrics:metrics-core:3.2.6",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:jackrabbit-data:${jackrabbit.version}",
- "start-order":"15"
- },
- {
- "id":"org.apache.jackrabbit:jackrabbit-jcr-commons:${jackrabbit.version}",
- "start-order":"15"
- },
- {
- "id":"org.apache.jackrabbit:jackrabbit-jcr-rmi:${jackrabbit.version}",
- "start-order":"15"
- },
- {
- "id":"org.apache.jackrabbit:jackrabbit-spi-commons:${jackrabbit.version}",
- "start-order":"15"
- },
- {
- "id":"org.apache.jackrabbit:jackrabbit-spi:${jackrabbit.version}",
- "start-order":"15"
- },
- {
- "id":"org.apache.jackrabbit:jackrabbit-webdav:${jackrabbit.version}",
- "start-order":"15"
- },
- {
"id":"org.apache.sling:org.apache.sling.commons.metrics:1.2.8",
"start-order":"15"
},
- {
- "id":"org.apache.sling:org.apache.sling.jcr.api:2.4.0",
- "start-order":"15"
- },
- {
- "id":"org.apache.sling:org.apache.sling.jcr.base:3.1.4",
- "start-order":"15"
- },
- {
- "id":"org.apache.sling:org.apache.sling.jcr.davex:1.3.10",
- "start-order":"15"
- },
+
{
"id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager:3.0.6",
"start-order":"20"
@@ -286,33 +236,21 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.jcr-wrapper:2.0.0",
- "start-order":"15"
- },
- {
- "id":"org.apache.sling:org.apache.sling.jcr.registration:1.0.6",
- "start-order":"15"
- },
- {
- "id":"org.apache.sling:org.apache.sling.jcr.webdav:2.3.8",
- "start-order":"15"
- },
- {
"id":"org.apache.sling:org.apache.sling.resource.filter:1.0.0",
"start-order":"15"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.24",
+ "id":"org.apache.sling:org.apache.sling.provisioning.model:1.8.6",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.provisioning.model:1.8.6",
+ "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.2",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.2",
+ "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.24",
"start-order":"20"
- }
+ }
],
"configurations":{
"org.apache.sling.commons.log.LogManager":{
diff --git a/src/main/features/oak.json b/src/main/features/oak.json
index 0c1479d..5822c37 100644
--- a/src/main/features/oak.json
+++ b/src/main/features/oak.json
@@ -6,6 +6,34 @@
"start-order":"10"
},
{
+ "id":"com.google.guava:guava:15.0",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.jackrabbit:jackrabbit-data:${jackrabbit.version}",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.jackrabbit:jackrabbit-jcr-commons:${jackrabbit.version}",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.jackrabbit:jackrabbit-jcr-rmi:${jackrabbit.version}",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.jackrabbit:jackrabbit-spi-commons:${jackrabbit.version}",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.jackrabbit:jackrabbit-spi:${jackrabbit.version}",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.jackrabbit:jackrabbit-webdav:${jackrabbit.version}",
+ "start-order":"15"
+ },
+ {
"id":"org.apache.jackrabbit:oak-api:${oak.version}",
"start-order":"15"
},
@@ -62,8 +90,44 @@
"start-order":"15"
},
{
+ "id":"org.apache.sling:org.apache.sling.jcr.api:2.4.0",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.base:3.1.4",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.davex:1.3.10",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.jcr-wrapper:2.0.0",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.registration:1.0.6",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.webdav:2.3.8",
+ "start-order":"15"
+ },
+ {
"id":"org.apache.sling:org.apache.sling.jcr.oak.server:1.2.4",
"start-order":"16"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.installer.provider.jcr:3.3.0",
+ "start-order":"20"
+ },
+ {
+ "id":"org.apache.jackrabbit.vault:org.apache.jackrabbit.vault:3.4.4",
+ "start-order":"20"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.contentloader:2.3.0",
+ "start-order":"20"
}
],
"configurations":{
diff --git a/src/main/features/persistence/oak_persistence_mongods.json b/src/main/features/persistence/oak_persistence_mongods.json
index 0f4adec..aef067c 100644
--- a/src/main/features/persistence/oak_persistence_mongods.json
+++ b/src/main/features/persistence/oak_persistence_mongods.json
@@ -1,11 +1,11 @@
{
"bundles":[
{
- "id":"com.h2database:h2-mvstore:1.4.194",
- "start-order":"15"
+ "id":"com.h2database:h2-mvstore:1.4.194",
+ "start-order":"15"
},
{
- "id":"org.mongodb:mongo-java-driver:3.8.2",
+ "id":"org.mongodb:mongo-java-driver:3.8.2",
"start-order":"15"
}
],
diff --git a/src/main/features/persistence/oak_persistence_sns.json b/src/main/features/persistence/oak_persistence_sns.json
index bc11ac4..f852165 100644
--- a/src/main/features/persistence/oak_persistence_sns.json
+++ b/src/main/features/persistence/oak_persistence_sns.json
@@ -1,7 +1,7 @@
{
"bundles":[
{
- "id":"org.apache.jackrabbit:oak-segment-tar:1.26.0",
+ "id":"org.apache.jackrabbit:oak-segment-tar:${oak.version}",
"start-order":"15"
}
],
[sling-org-apache-sling-starter] 03/04: SLING-9636 - Refine feature
model files
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit 6c965cb21621b54197f35daae8c0aa0c6bf997e9
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Aug 17 23:25:47 2020 +0200
SLING-9636 - Refine feature model files
Replace stray '\t' chars in repoinit blocks.
---
src/main/features/base.json | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/features/base.json b/src/main/features/base.json
index de78c6f..34c203b 100644
--- a/src/main/features/base.json
+++ b/src/main/features/base.json
@@ -417,7 +417,7 @@
"# general",
"create path (sling:OrderedFolder) /content",
"set ACL for everyone",
- "allow jcr:read\ton /content",
+ "allow jcr:read on /content",
"end",
"",
"# sling-mapping",
@@ -457,15 +457,15 @@
"create path (sling:Folder) /apps/sling/install",
"",
"set ACL for sling-jcr-install",
- "allow\tjcr:read\ton\t/",
- "allow\trep:write\ton /apps/sling/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\tjcr:all on\t/",
+ "allow jcr:all on /",
"allow jcr:namespaceManagement,jcr:nodeTypeDefinitionManagement on :repository",
"end"
]
[sling-org-apache-sling-starter] 02/04: SLING-9636 - Refine feature
model files
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit 6a8d6133ba87aaae1b3bc70789702a6c4efe6102
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Aug 17 23:24:16 2020 +0200
SLING-9636 - Refine feature model files
Create webconsole feature
---
src/main/features/base.json | 49 +-----------------------------
src/main/features/healthcheck.json | 4 ---
src/main/features/webconsole.json | 62 ++++++++++++++++++++++++++++++++++++++
3 files changed, 63 insertions(+), 52 deletions(-)
diff --git a/src/main/features/base.json b/src/main/features/base.json
index 8eeb46e..de78c6f 100644
--- a/src/main/features/base.json
+++ b/src/main/features/base.json
@@ -122,10 +122,6 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.serviceuser.webconsole:1.0.2",
- "start-order":"20"
- },
- {
"id":"org.apache.sling:org.apache.sling.serviceusermapper:1.4.4",
"start-order":"15"
},
@@ -198,30 +194,6 @@
"start-order":"5"
},
{
- "id":"org.apache.felix:org.apache.felix.webconsole.plugins.ds:2.1.0",
- "start-order":"5"
- },
- {
- "id":"org.apache.felix:org.apache.felix.webconsole.plugins.event:1.1.8",
- "start-order":"5"
- },
- {
- "id":"org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:1.0.10",
- "start-order":"5"
- },
- {
- "id":"org.apache.felix:org.apache.felix.webconsole.plugins.obr:1.0.4",
- "start-order":"5"
- },
- {
- "id":"org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin:1.0.4",
- "start-order":"5"
- },
- {
- "id":"org.apache.felix:org.apache.felix.webconsole:4.5.0",
- "start-order":"5"
- },
- {
"id":"org.apache.sling:org.apache.sling.api:2.22.0",
"start-order":"5"
},
@@ -230,22 +202,10 @@
"start-order":"5"
},
{
- "id":"org.apache.sling:org.apache.sling.commons.log.webconsole:1.0.0",
- "start-order":"5"
- },
- {
"id":"org.apache.sling:org.apache.sling.extensions.threaddump:0.2.2",
"start-order":"5"
},
{
- "id":"org.apache.sling:org.apache.sling.extensions.webconsolebranding:1.0.2",
- "start-order":"5"
- },
- {
- "id":"org.apache.sling:org.apache.sling.extensions.webconsolesecurityprovider:1.2.4",
- "start-order":"15"
- },
- {
"id":"org.apache.felix:org.apache.felix.http.sslfilter:1.2.6",
"start-order":"10"
},
@@ -334,10 +294,6 @@
"start-order":"15"
},
{
- "id":"org.apache.sling:org.apache.sling.jcr.webconsole:1.0.2",
- "start-order":"15"
- },
- {
"id":"org.apache.sling:org.apache.sling.jcr.webdav:2.3.8",
"start-order":"15"
},
@@ -402,16 +358,13 @@
"org.apache.sling.discovery.commons",
"org.apache.sling.discovery.base",
"org.apache.sling.discovery.oak",
- "org.apache.sling.extensions.webconsolesecurityprovider",
"org.apache.sling.i18n",
"org.apache.sling.jcr.base",
"org.apache.sling.jcr.contentloader",
"org.apache.sling.jcr.jackrabbit.usermanager",
"org.apache.sling.jcr.oak.server",
"org.apache.sling.jcr.repoinit",
- "org.apache.sling.jcr.webconsole",
- "org.apache.sling.servlets.post",
- "org.apache.sling.serviceuser.webconsole"
+ "org.apache.sling.servlets.post"
],
"whitelist.name":"sling"
},
diff --git a/src/main/features/healthcheck.json b/src/main/features/healthcheck.json
index 8b6dedb..e4b9271 100644
--- a/src/main/features/healthcheck.json
+++ b/src/main/features/healthcheck.json
@@ -14,10 +14,6 @@
"start-order":"5"
},
{
- "id":"org.apache.felix:org.apache.felix.healthcheck.webconsoleplugin:2.0.2",
- "start-order":"5"
- },
- {
"id":"org.apache.sling:org.apache.sling.hc.api:1.0.4",
"start-order":"20"
},
diff --git a/src/main/features/webconsole.json b/src/main/features/webconsole.json
new file mode 100644
index 0000000..858f86e
--- /dev/null
+++ b/src/main/features/webconsole.json
@@ -0,0 +1,62 @@
+{
+ "bundles": [
+ {
+ "id":"org.apache.felix:org.apache.felix.webconsole:4.5.0",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.webconsole.plugins.ds:2.1.0",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.webconsole.plugins.event:1.1.8",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:1.0.10",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.webconsole.plugins.obr:1.0.4",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin:1.0.4",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.commons.log.webconsole:1.0.0",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.extensions.webconsolebranding:1.0.2",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.healthcheck.webconsoleplugin:2.0.2",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.extensions.webconsolesecurityprovider:1.2.4",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.jcr.webconsole:1.0.2",
+ "start-order":"15"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.serviceuser.webconsole:1.0.2",
+ "start-order":"20"
+ }
+ ],
+ "configurations": {
+ "org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~webconsole":{
+ "whitelist.bundles":[
+ "org.apache.sling.extensions.webconsolesecurityprovider",
+ "org.apache.sling.jcr.webconsole",
+ "org.apache.sling.serviceuser.webconsole"
+ ],
+ "whitelist.name":"webconsole"
+ }
+ }
+}
\ No newline at end of file