You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2020/10/09 03:11:02 UTC
[sling-org-apache-sling-app-cms] branch master updated: Removing
unneeded ID's
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to refs/heads/master by this push:
new ae8a199 Removing unneeded ID's
ae8a199 is described below
commit ae8a199ee2009c4ba5617de7df06f300a851a297
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Oct 8 23:10:35 2020 -0400
Removing unneeded ID's
---
feature/src/main/features/app/cms.json | 8 ++++++++
feature/src/main/features/base.json | 8 +++-----
feature/src/main/features/discovery.json | 3 +--
feature/src/main/features/event.json | 3 +--
feature/src/main/features/healthcheck.json | 3 +--
feature/src/main/features/models-jacksonexporter.json | 3 +--
.../main/features/oak/node-store/composite-seed.json | 19 +++++++++++++++++--
feature/src/main/features/oak/oak_base.json | 2 +-
feature/src/main/features/scripting.json | 7 +++----
feature/src/main/features/validation.json | 3 +--
10 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/feature/src/main/features/app/cms.json b/feature/src/main/features/app/cms.json
index 27884b7..75269de 100644
--- a/feature/src/main/features/app/cms.json
+++ b/feature/src/main/features/app/cms.json
@@ -7,6 +7,14 @@
"start-order":"5"
},
{
+ "id":"org.apache.sling:org.apache.sling.launchpad.api:1.2.0",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.launchpad.startupmanager:1.0.0",
+ "start-order":"5"
+ },
+ {
"id":"org.apache.sling:org.apache.sling.cms.api:${cms.version}",
"start-order":"20"
},
diff --git a/feature/src/main/features/base.json b/feature/src/main/features/base.json
index 4537744..f01d2c6 100644
--- a/feature/src/main/features/base.json
+++ b/feature/src/main/features/base.json
@@ -202,10 +202,6 @@
"start-order":"10"
},
{
- "id":"org.apache.tika:tika-parsers:1.24",
- "start-order":"10"
- },
- {
"id":"io.dropwizard.metrics:metrics-core:3.2.6",
"start-order":"15"
},
@@ -274,13 +270,15 @@
"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.servlets.post"
+ "org.apache.sling.servlets.post",
+ "org.apache.sling.serviceuser.webconsole"
],
"whitelist.name":"sling"
},
diff --git a/feature/src/main/features/discovery.json b/feature/src/main/features/discovery.json
index e6c522e..af52a5b 100644
--- a/feature/src/main/features/discovery.json
+++ b/feature/src/main/features/discovery.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:sling-discovery:${cms.version}",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.discovery.api:1.0.4",
@@ -42,4 +41,4 @@
"allow jcr:read,rep:write on /var/discovery",
"end"
]
-}
\ No newline at end of file
+}
diff --git a/feature/src/main/features/event.json b/feature/src/main/features/event.json
index c1927a3..19fdb93 100644
--- a/feature/src/main/features/event.json
+++ b/feature/src/main/features/event.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:sling-event:${cms.version}",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.event.dea:1.1.4",
@@ -29,4 +28,4 @@
"allow jcr:read,rep:write on /var/eventing",
"end"
]
-}
\ No newline at end of file
+}
diff --git a/feature/src/main/features/healthcheck.json b/feature/src/main/features/healthcheck.json
index 4a67929..b947e58 100644
--- a/feature/src/main/features/healthcheck.json
+++ b/feature/src/main/features/healthcheck.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:healthcheck:${cms.version}",
"bundles":[
{
"id":"org.apache.felix:org.apache.felix.healthcheck.api:2.0.4",
@@ -100,4 +99,4 @@
]
}
}
-}
\ No newline at end of file
+}
diff --git a/feature/src/main/features/models-jacksonexporter.json b/feature/src/main/features/models-jacksonexporter.json
index 00bcbf0..1bc629a 100644
--- a/feature/src/main/features/models-jacksonexporter.json
+++ b/feature/src/main/features/models-jacksonexporter.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:sling-models-jacksonexporter_models-jacksonexporter:${cms.version}",
"bundles":[
{
"id":"com.fasterxml.jackson.core:jackson-annotations:${jackson.version}",
@@ -19,4 +18,4 @@
"start-order":"20"
}
]
-}
\ No newline at end of file
+}
diff --git a/feature/src/main/features/oak/node-store/composite-seed.json b/feature/src/main/features/oak/node-store/composite-seed.json
index 390a31d..3e3c768 100644
--- a/feature/src/main/features/oak/node-store/composite-seed.json
+++ b/feature/src/main/features/oak/node-store/composite-seed.json
@@ -4,8 +4,23 @@
"servletPath": "/system/health"
},
"org.apache.jackrabbit.oak.segment.SegmentNodeStoreService": {
- "name": "Default NodeStore",
- "standby": true
+ "name": "Default NodeStore"
+ },
+ "org.apache.sling.commons.log.LogManager.factory.config~oak.log": {
+ "org.apache.sling.commons.log.pattern": "%-4r [%t] %-5p %c %x - %m%n",
+ "org.apache.sling.commons.log.names": [
+ "org.apache.jackrabbit.oak"
+ ],
+ "org.apache.sling.commons.log.level": "debug",
+ "org.apache.sling.commons.log.file": "logs/oak.log"
+ },
+ "org.apache.sling.commons.log.LogManager.factory.config~composum.log": {
+ "org.apache.sling.commons.log.pattern": "%-4r [%t] %-5p %c %x - %m%n",
+ "org.apache.sling.commons.log.names": [
+ "com.composum"
+ ],
+ "org.apache.sling.commons.log.level": "debug",
+ "org.apache.sling.commons.log.file": "logs/composum.log"
},
"org.apache.jackrabbit.oak.segment.SegmentNodeStoreService~global": {
"name": "Default NodeStore",
diff --git a/feature/src/main/features/oak/oak_base.json b/feature/src/main/features/oak/oak_base.json
index a566fa1..498d00a 100644
--- a/feature/src/main/features/oak/oak_base.json
+++ b/feature/src/main/features/oak/oak_base.json
@@ -123,7 +123,7 @@
},
{
"id":"org.apache.sling:org.apache.sling.jcr.oak.server:1.2.8",
- "start-order":"16"
+ "start-order":"20"
},
{
"id":"org.apache.sling:org.apache.sling.jcr.resource:3.0.22",
diff --git a/feature/src/main/features/scripting.json b/feature/src/main/features/scripting.json
index f882473..45c4205 100644
--- a/feature/src/main/features/scripting.json
+++ b/feature/src/main/features/scripting.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:scripting_sling:${cms.version}",
"bundles":[
{
"id":"org.antlr:antlr4-runtime:4.7.2",
@@ -15,7 +14,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.core:2.3.0",
+ "id":"org.apache.sling:org.apache.sling.scripting.core:2.3.2",
"start-order":"20"
},
{
@@ -59,7 +58,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.sightly:1.4.0-1.4.0",
+ "id":"org.apache.sling:org.apache.sling.scripting.sightly:1.4.2-1.4.0",
"start-order":"20"
}
],
@@ -89,4 +88,4 @@
"end",
"# SLING-5848 - Define service user and ACLs for Scripting >>>"
]
-}
\ No newline at end of file
+}
diff --git a/feature/src/main/features/validation.json b/feature/src/main/features/validation.json
index df53e3c..73d7be6 100644
--- a/feature/src/main/features/validation.json
+++ b/feature/src/main/features/validation.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.feature:slingfeature:sling-validation:${cms.version}",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.models.validation-impl:1.0.0",
@@ -33,4 +32,4 @@
"allow jcr:read on /libs",
"end"
]
-}
\ No newline at end of file
+}