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 21:09:15 UTC
[sling-org-apache-sling-starter] branch master updated (5dfeeda ->
654da5d)
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 5dfeeda Update to o.a.s.jcr.base 3.1.4
new 73aa765 SLING-9636 - Refine feature model files
new f027f78 SLING-9636 - Refine feature model files
new e0ef7d0 SLING-9636 - Refine feature model files
new 9317646 SLING-9636 - Refine feature model files
new 7e106d0 SLING-9636 - Refine feature model files
new deb9546 SLING-9636 - Refine feature model files
new e676424 SLING-9636 - Refine feature model files
new 654da5d SLING-9636 - Refine feature model files
The 8 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:
pom.xml | 8 ++
src/main/features/{sling_sling.json => base.json} | 96 ++++++++++++--
.../{launchpad_launchpad.json => boot.json} | 130 ++++++++++++++++++-
src/main/features/boot_boot.json | 139 ---------------------
...-caconfig_sling-caconfig.json => caconfig.json} | 1 -
...{composum_composum-nodes.json => composum.json} | 14 +--
...scovery_sling-discovery.json => discovery.json} | 1 -
.../{sling-event_sling-event.json => event.json} | 1 -
...althcheck_healthcheck.json => healthcheck.json} | 1 -
...onexporter.json => models-jacksonexporter.json} | 10 +-
src/main/features/{oak_oak.json => oak.json} | 32 +++--
.../persistence/oak_persistence_mongods.json | 1 -
.../features/persistence/oak_persistence_sns.json | 1 -
src/main/features/repoinit_repoinit.json | 74 -----------
.../{scripting_sling.json => scripting.json} | 1 -
.../{sling_slingshot.json => slingshot.json} | 1 -
src/main/features/standalone_standalone.json | 16 ---
...ation_sling-validation.json => validation.json} | 1 -
src/main/features/webapp_webapp.json | 4 -
19 files changed, 240 insertions(+), 292 deletions(-)
rename src/main/features/{sling_sling.json => base.json} (84%)
rename src/main/features/{launchpad_launchpad.json => boot.json} (83%)
delete mode 100644 src/main/features/boot_boot.json
rename src/main/features/{sling-caconfig_sling-caconfig.json => caconfig.json} (88%)
rename src/main/features/{composum_composum-nodes.json => composum.json} (79%)
rename src/main/features/{sling-discovery_sling-discovery.json => discovery.json} (93%)
rename src/main/features/{sling-event_sling-event.json => event.json} (90%)
rename src/main/features/{healthcheck_healthcheck.json => healthcheck.json} (97%)
rename src/main/features/{sling-models-jacksonexporter_models-jacksonexporter.json => models-jacksonexporter.json} (52%)
rename src/main/features/{oak_oak.json => oak.json} (74%)
delete mode 100644 src/main/features/repoinit_repoinit.json
rename src/main/features/{scripting_sling.json => scripting.json} (96%)
rename src/main/features/{sling_slingshot.json => slingshot.json} (93%)
delete mode 100644 src/main/features/standalone_standalone.json
rename src/main/features/{sling-validation_sling-validation.json => validation.json} (91%)
delete mode 100644 src/main/features/webapp_webapp.json
[sling-org-apache-sling-starter] 03/08: 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 e0ef7d0649264d3d8187d340d8b965909bf1631e
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Aug 17 22:16:08 2020 +0200
SLING-9636 - Refine feature model files
Remove empty webapp feature.
---
src/main/features/webapp.json | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/main/features/webapp.json b/src/main/features/webapp.json
deleted file mode 100644
index c48ea3e..0000000
--- a/src/main/features/webapp.json
+++ /dev/null
@@ -1,4 +0,0 @@
-
-{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:webapp:12-SNAPSHOT"
-}
\ No newline at end of file
[sling-org-apache-sling-starter] 04/08: 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 931764646a069802356fa490bc24cf1ee42461d6
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Aug 17 22:20:02 2020 +0200
SLING-9636 - Refine feature model files
Stop using explicit feature ids.
---
src/main/features/base.json | 1 -
src/main/features/boot.json | 1 -
src/main/features/caconfig.json | 1 -
src/main/features/composum.json | 1 -
src/main/features/discovery.json | 1 -
src/main/features/event.json | 1 -
src/main/features/healthcheck.json | 1 -
src/main/features/launchpad.json | 1 -
src/main/features/models-jacksonexporter.json | 1 -
src/main/features/oak.json | 1 -
src/main/features/persistence/oak_persistence_mongods.json | 1 -
src/main/features/persistence/oak_persistence_sns.json | 1 -
src/main/features/repoinit.json | 1 -
src/main/features/scripting.json | 1 -
src/main/features/slingshot.json | 1 -
src/main/features/standalone.json | 1 -
src/main/features/validation.json | 1 -
17 files changed, 17 deletions(-)
diff --git a/src/main/features/base.json b/src/main/features/base.json
index 1051826..48ebaff 100644
--- a/src/main/features/base.json
+++ b/src/main/features/base.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:base:12-SNAPSHOT",
"bundles":[
{
"id":"commons-codec:commons-codec:1.14",
diff --git a/src/main/features/boot.json b/src/main/features/boot.json
index 255e3f0..657d1e4 100644
--- a/src/main/features/boot.json
+++ b/src/main/features/boot.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:boot:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.aries:org.apache.aries.util:1.1.3",
diff --git a/src/main/features/caconfig.json b/src/main/features/caconfig.json
index 258a3a8..36ac153 100644
--- a/src/main/features/caconfig.json
+++ b/src/main/features/caconfig.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:caconfig:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.caconfig.api:1.2.0",
diff --git a/src/main/features/composum.json b/src/main/features/composum.json
index dc91b6b..d0ae8b5 100644
--- a/src/main/features/composum.json
+++ b/src/main/features/composum.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:composum:12-SNAPSHOT",
"bundles":[
{
"id":"com.composum.sling.core:composum-sling-core-commons:${composum.nodes.version}",
diff --git a/src/main/features/discovery.json b/src/main/features/discovery.json
index d8eea26..52bf85f 100644
--- a/src/main/features/discovery.json
+++ b/src/main/features/discovery.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:discovery:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.discovery.api:1.0.4",
diff --git a/src/main/features/event.json b/src/main/features/event.json
index feccdf1..2d96d7d 100644
--- a/src/main/features/event.json
+++ b/src/main/features/event.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:event:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.event.dea:1.1.4",
diff --git a/src/main/features/healthcheck.json b/src/main/features/healthcheck.json
index 6b4e2b9..8b6dedb 100644
--- a/src/main/features/healthcheck.json
+++ b/src/main/features/healthcheck.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:healthcheck:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.felix:org.apache.felix.healthcheck.api:2.0.4",
diff --git a/src/main/features/launchpad.json b/src/main/features/launchpad.json
index bd204f1..5805fd6 100644
--- a/src/main/features/launchpad.json
+++ b/src/main/features/launchpad.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:launchpad:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.launchpad.base:6.0.2-2.6.36",
diff --git a/src/main/features/models-jacksonexporter.json b/src/main/features/models-jacksonexporter.json
index ef43a6d..57ebae3 100644
--- a/src/main/features/models-jacksonexporter.json
+++ b/src/main/features/models-jacksonexporter.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:models-jacksonexporter:12-SNAPSHOT",
"bundles":[
{
"id":"com.fasterxml.jackson.core:jackson-annotations:${jackson.version}",
diff --git a/src/main/features/oak.json b/src/main/features/oak.json
index dd891e4..0c1479d 100644
--- a/src/main/features/oak.json
+++ b/src/main/features/oak.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:oak:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.felix:org.apache.felix.jaas:1.0.2",
diff --git a/src/main/features/persistence/oak_persistence_mongods.json b/src/main/features/persistence/oak_persistence_mongods.json
index c1137a8..0f4adec 100644
--- a/src/main/features/persistence/oak_persistence_mongods.json
+++ b/src/main/features/persistence/oak_persistence_mongods.json
@@ -1,5 +1,4 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:oak_persistence_mongods:12-SNAPSHOT",
"bundles":[
{
"id":"com.h2database:h2-mvstore:1.4.194",
diff --git a/src/main/features/persistence/oak_persistence_sns.json b/src/main/features/persistence/oak_persistence_sns.json
index 844c841..bc11ac4 100644
--- a/src/main/features/persistence/oak_persistence_sns.json
+++ b/src/main/features/persistence/oak_persistence_sns.json
@@ -1,5 +1,4 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:oak_persistence_sns:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.jackrabbit:oak-segment-tar:1.26.0",
diff --git a/src/main/features/repoinit.json b/src/main/features/repoinit.json
index f1f18e3..840909e 100644
--- a/src/main/features/repoinit.json
+++ b/src/main/features/repoinit.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:repoinit:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.24",
diff --git a/src/main/features/scripting.json b/src/main/features/scripting.json
index 61be4c0..56e883b 100644
--- a/src/main/features/scripting.json
+++ b/src/main/features/scripting.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:scripting:12-SNAPSHOT",
"bundles":[
{
"id":"org.antlr:antlr4-runtime:4.7.2",
diff --git a/src/main/features/slingshot.json b/src/main/features/slingshot.json
index 2e1f66c..62350eb 100644
--- a/src/main/features/slingshot.json
+++ b/src/main/features/slingshot.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:slingshot:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.sample.slingshot:0.9.0",
diff --git a/src/main/features/standalone.json b/src/main/features/standalone.json
index 3414749..1b44ab9 100644
--- a/src/main/features/standalone.json
+++ b/src/main/features/standalone.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:standalone:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.felix:org.apache.felix.http.jetty:4.0.18",
diff --git a/src/main/features/validation.json b/src/main/features/validation.json
index dae4076..4fac69a 100644
--- a/src/main/features/validation.json
+++ b/src/main/features/validation.json
@@ -1,6 +1,5 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:validation:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.models.validation-impl:1.0.0",
[sling-org-apache-sling-starter] 08/08: 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 654da5d1208016f7564bda4a8e9a335544bca8c7
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Aug 17 23:08:56 2020 +0200
SLING-9636 - Refine feature model files
Move the 'standalone' feature to the base feature.
---
src/main/features/base.json | 8 ++++++++
src/main/features/standalone.json | 15 ---------------
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/src/main/features/base.json b/src/main/features/base.json
index e184232..10ddf35 100644
--- a/src/main/features/base.json
+++ b/src/main/features/base.json
@@ -182,6 +182,14 @@
"start-order":"5"
},
{
+ "id":"org.apache.felix:org.apache.felix.http.jetty:4.0.18",
+ "start-order":"5"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.http.servlet-api:1.1.2",
+ "start-order":"5"
+ },
+ {
"id":"org.apache.felix:org.apache.felix.http.whiteboard:4.0.0",
"start-order":"5"
},
diff --git a/src/main/features/standalone.json b/src/main/features/standalone.json
deleted file mode 100644
index 1b44ab9..0000000
--- a/src/main/features/standalone.json
+++ /dev/null
@@ -1,15 +0,0 @@
-
-{
- "bundles":[
- {
- "id":"org.apache.felix:org.apache.felix.http.jetty:4.0.18",
- "run-modes":":standalone",
- "start-order":"5"
- },
- {
- "id":"org.apache.felix:org.apache.felix.http.servlet-api:1.1.2",
- "run-modes":":standalone",
- "start-order":"5"
- }
- ]
-}
\ No newline at end of file
[sling-org-apache-sling-starter] 01/08: 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 73aa7658d54a530709af52eceecbf8f99aa98715
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Aug 17 17:33:56 2020 +0200
SLING-9636 - Refine feature model files
Use placeholders for versions instead of variables. According to the
documentation, variables are used for late binding and can be used in framework
properties and values of configurations.
---
pom.xml | 8 ++++++
src/main/features/boot_boot.json | 9 +++----
src/main/features/composum_composum-nodes.json | 13 ++++-----
src/main/features/oak_oak.json | 31 ++++++++++------------
...els-jacksonexporter_models-jacksonexporter.json | 9 +++----
src/main/features/sling_sling.json | 15 +++++------
6 files changed, 39 insertions(+), 46 deletions(-)
diff --git a/pom.xml b/pom.xml
index 370a699..7ebe269 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,13 @@
<properties>
<sling.java.version>8</sling.java.version>
<IT.expected.bundles.count>126</IT.expected.bundles.count>
+
+ <!-- versions to be replaced in the feature files -->
+ <jackrabbit.version>2.20.0</jackrabbit.version>
+ <oak.version>1.26.0</oak.version>
+ <slf4j.version>1.7.25</slf4j.version>
+ <composum.nodes.version>1.12.0</composum.nodes.version>
+ <jackson.version>2.11.1</jackson.version>
</properties>
<build>
@@ -74,6 +81,7 @@
<version>1.3.14</version>
<extensions>true</extensions>
<configuration>
+ <replacePropertyVariables>jackrabbit.version,oak.version,slf4j.version,composum.nodes.version,jackson.version</replacePropertyVariables>
<framework>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
diff --git a/src/main/features/boot_boot.json b/src/main/features/boot_boot.json
index d747199..255e3f0 100644
--- a/src/main/features/boot_boot.json
+++ b/src/main/features/boot_boot.json
@@ -1,9 +1,6 @@
{
"id":"org.apache.sling:org.apache.sling.starter:slingfeature:boot:12-SNAPSHOT",
- "variables":{
- "slf4j.version":"1.7.25"
- },
"bundles":[
{
"id":"org.apache.aries:org.apache.aries.util:1.1.3",
@@ -114,15 +111,15 @@
"start-order":"1"
},
{
- "id":"org.slf4j:jcl-over-slf4j:1.7.25",
+ "id":"org.slf4j:jcl-over-slf4j:${slf4j.version}",
"start-order":"1"
},
{
- "id":"org.slf4j:log4j-over-slf4j:1.7.25",
+ "id":"org.slf4j:log4j-over-slf4j:${slf4j.version}",
"start-order":"1"
},
{
- "id":"org.slf4j:slf4j-api:1.7.25",
+ "id":"org.slf4j:slf4j-api:${slf4j.version}",
"start-order":"1"
},
{
diff --git a/src/main/features/composum_composum-nodes.json b/src/main/features/composum_composum-nodes.json
index 408ceb3..7b50199 100644
--- a/src/main/features/composum_composum-nodes.json
+++ b/src/main/features/composum_composum-nodes.json
@@ -1,28 +1,25 @@
{
"id":"org.apache.sling:org.apache.sling.starter:slingfeature:composum_composum-nodes:12-SNAPSHOT",
- "variables":{
- "composum.nodes.version":"1.12.0"
- },
"bundles":[
{
- "id":"com.composum.sling.core:composum-sling-core-commons:1.12.0",
+ "id":"com.composum.sling.core:composum-sling-core-commons:${composum.nodes.version}",
"start-order":"20"
},
{
- "id":"com.composum.sling.core:composum-sling-core-console:1.12.0",
+ "id":"com.composum.sling.core:composum-sling-core-console:${composum.nodes.version}",
"start-order":"20"
},
{
- "id":"com.composum.sling.core:composum-sling-core-jslibs:1.12.0",
+ "id":"com.composum.sling.core:composum-sling-core-jslibs:${composum.nodes.version}",
"start-order":"20"
},
{
- "id":"com.composum.sling.core:composum-sling-package-manager:1.12.0",
+ "id":"com.composum.sling.core:composum-sling-package-manager:${composum.nodes.version}",
"start-order":"20"
},
{
- "id":"com.composum.sling.core:composum-sling-user-management:1.12.0",
+ "id":"com.composum.sling.core:composum-sling-user-management:${composum.nodes.version}",
"start-order":"20"
}
],
diff --git a/src/main/features/oak_oak.json b/src/main/features/oak_oak.json
index 694bf7b..dd891e4 100644
--- a/src/main/features/oak_oak.json
+++ b/src/main/features/oak_oak.json
@@ -1,68 +1,65 @@
{
"id":"org.apache.sling:org.apache.sling.starter:slingfeature:oak:12-SNAPSHOT",
- "variables":{
- "oak.version":"1.26.0"
- },
"bundles":[
{
"id":"org.apache.felix:org.apache.felix.jaas:1.0.2",
"start-order":"10"
},
{
- "id":"org.apache.jackrabbit:oak-api:1.26.0",
+ "id":"org.apache.jackrabbit:oak-api:${oak.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:oak-blob-plugins:1.26.0",
+ "id":"org.apache.jackrabbit:oak-blob-plugins:${oak.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:oak-blob:1.26.0",
+ "id":"org.apache.jackrabbit:oak-blob:${oak.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:oak-commons:1.26.0",
+ "id":"org.apache.jackrabbit:oak-commons:${oak.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:oak-core-spi:1.26.0",
+ "id":"org.apache.jackrabbit:oak-core-spi:${oak.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:oak-core:1.26.0",
+ "id":"org.apache.jackrabbit:oak-core:${oak.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:oak-jackrabbit-api:1.26.0",
+ "id":"org.apache.jackrabbit:oak-jackrabbit-api:${oak.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:oak-jcr:1.26.0",
+ "id":"org.apache.jackrabbit:oak-jcr:${oak.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:oak-lucene:1.26.0",
+ "id":"org.apache.jackrabbit:oak-lucene:${oak.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:oak-query-spi:1.26.0",
+ "id":"org.apache.jackrabbit:oak-query-spi:${oak.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:oak-security-spi:1.26.0",
+ "id":"org.apache.jackrabbit:oak-security-spi:${oak.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:oak-store-composite:1.26.0",
+ "id":"org.apache.jackrabbit:oak-store-composite:${oak.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:oak-store-document:1.26.0",
+ "id":"org.apache.jackrabbit:oak-store-document:${oak.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:oak-store-spi:1.26.0",
+ "id":"org.apache.jackrabbit:oak-store-spi:${oak.version}",
"start-order":"15"
},
{
diff --git a/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json b/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json
index 77f390a..547488c 100644
--- a/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json
+++ b/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json
@@ -1,20 +1,17 @@
{
"id":"org.apache.sling:org.apache.sling.starter:slingfeature:sling-models-jacksonexporter_models-jacksonexporter:12-SNAPSHOT",
- "variables":{
- "jackson.version":"2.11.1"
- },
"bundles":[
{
- "id":"com.fasterxml.jackson.core:jackson-annotations:2.11.1",
+ "id":"com.fasterxml.jackson.core:jackson-annotations:${jackson.version}",
"start-order":"20"
},
{
- "id":"com.fasterxml.jackson.core:jackson-core:2.11.1",
+ "id":"com.fasterxml.jackson.core:jackson-core:${jackson.version}",
"start-order":"20"
},
{
- "id":"com.fasterxml.jackson.core:jackson-databind:2.11.1",
+ "id":"com.fasterxml.jackson.core:jackson-databind:${jackson.version}",
"start-order":"20"
},
{
diff --git a/src/main/features/sling_sling.json b/src/main/features/sling_sling.json
index 142c58d..1ff583e 100644
--- a/src/main/features/sling_sling.json
+++ b/src/main/features/sling_sling.json
@@ -1,9 +1,6 @@
{
"id":"org.apache.sling:org.apache.sling.starter:slingfeature:sling:12-SNAPSHOT",
- "variables":{
- "jackrabbit.version":"2.20.0"
- },
"bundles":[
{
"id":"commons-codec:commons-codec:1.14",
@@ -278,27 +275,27 @@
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:jackrabbit-data:2.20.0",
+ "id":"org.apache.jackrabbit:jackrabbit-data:${jackrabbit.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:jackrabbit-jcr-commons:2.20.0",
+ "id":"org.apache.jackrabbit:jackrabbit-jcr-commons:${jackrabbit.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:jackrabbit-jcr-rmi:2.20.0",
+ "id":"org.apache.jackrabbit:jackrabbit-jcr-rmi:${jackrabbit.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:jackrabbit-spi-commons:2.20.0",
+ "id":"org.apache.jackrabbit:jackrabbit-spi-commons:${jackrabbit.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:jackrabbit-spi:2.20.0",
+ "id":"org.apache.jackrabbit:jackrabbit-spi:${jackrabbit.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:jackrabbit-webdav:2.20.0",
+ "id":"org.apache.jackrabbit:jackrabbit-webdav:${jackrabbit.version}",
"start-order":"15"
},
{
[sling-org-apache-sling-starter] 06/08: 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 deb95460a9cdf1d324439c694af57688a0ed52ec
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Aug 17 23:03:05 2020 +0200
SLING-9636 - Refine feature model files
Move all framework properties to boot.json
---
src/main/features/boot.json | 9 ++++++++-
src/main/features/launchpad.json | 11 +----------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/main/features/boot.json b/src/main/features/boot.json
index 657d1e4..365c8d8 100644
--- a/src/main/features/boot.json
+++ b/src/main/features/boot.json
@@ -130,6 +130,13 @@
"framework-properties":{
"sling.run.mode.install.options":"oak_tar,oak_mongo",
"localIndexDir":"${sling.home}/repository/index",
- "repository.home":"${sling.home}/repository"
+ "repository.home":"${sling.home}/repository",
+ "sling.jre.java.xml":",javax.xml;version=\"2.1.0\",javax.xml.datatype;uses:=\"javax.xml.namespace\";version=\"2.1.0\",javax.xml.namespace;version=\"2.1.0\",javax.xml.parsers;uses:=\"javax.xml.validation,org.w3c.dom,org.xml.sax,org.xml.sax.helpers\";version=\"2.1.0\",javax.xml.stream;uses:=\"javax.xml.namespace,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform\";version=\"1.0.0\",javax.xml.stream.events;uses:=\"javax.xml.namespace,javax.xml.stream\";version=\"1.0.0 [...]
+ "felix.systempackages.calculate.uses":"true",
+ "org.osgi.framework.system.packages":"org.osgi.framework;version=\"1.9\",org.osgi.framework.dto;version=\"1.8\";uses:=\"org.osgi.dto\",org.osgi.framework.hooks.bundle;version=\"1.1\";uses:=\"org.osgi.framework\",org.osgi.framework.hooks.resolver;version=\"1.0\";uses:=\"org.osgi.framework.wiring\",org.osgi.framework.hooks.service;version=\"1.1\";uses:=\"org.osgi.framework\",org.osgi.framework.hooks.weaving;version=\"1.1\";uses:=\"org.osgi.framework.wiring\",org.osgi.framework.laun [...]
+ "felix.systempackages.substitution":"true",
+ "sling.jre-jpms":"{dollar}{felix.jpms.java.base}{dollar}{felix.jpms.java.compiler}{dollar}{felix.jpms.java.datatransfer}{dollar}{felix.jpms.java.desktop}{dollar}{felix.jpms.java.instrument}{dollar}{felix.jpms.java.logging}{dollar}{felix.jpms.java.management}{dollar}{felix.jpms.java.management.rmi}{dollar}{felix.jpms.java.naming}{dollar}{felix.jpms.java.net.http}{dollar}{felix.jpms.java.prefs}{dollar}{felix.jpms.java.rmi}{dollar}{felix.jpms.java.scripting}{dollar}{felix.jpms.java. [...]
+ "sling.jpms.java.xml":"{dollar}{sling.jre.java.xml},javax.xml.catalog;uses:=\"javax.xml.namespace\";version=\"1.0.0\"",
+ "sling.jre-1.8":",java.applet;version=\"{dollar}{felix.detect.java.version}\",java.awt;version=\"{dollar}{felix.detect.java.version}\",java.awt.color;version=\"{dollar}{felix.detect.java.version}\",java.awt.datatransfer;version=\"{dollar}{felix.detect.java.version}\",java.awt.dnd;version=\"{dollar}{felix.detect.java.version}\",java.awt.event;version=\"{dollar}{felix.detect.java.version}\",java.awt.font;version=\"{dollar}{felix.detect.java.version}\",java.awt.geom;version=\"{dolla [...]
}
}
diff --git a/src/main/features/launchpad.json b/src/main/features/launchpad.json
index 5805fd6..965ea25 100644
--- a/src/main/features/launchpad.json
+++ b/src/main/features/launchpad.json
@@ -5,14 +5,5 @@
"id":"org.apache.sling:org.apache.sling.launchpad.base:6.0.2-2.6.36",
"start-order":"20"
}
- ],
- "framework-properties":{
- "sling.jre.java.xml":",javax.xml;version=\"2.1.0\",javax.xml.datatype;uses:=\"javax.xml.namespace\";version=\"2.1.0\",javax.xml.namespace;version=\"2.1.0\",javax.xml.parsers;uses:=\"javax.xml.validation,org.w3c.dom,org.xml.sax,org.xml.sax.helpers\";version=\"2.1.0\",javax.xml.stream;uses:=\"javax.xml.namespace,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform\";version=\"1.0.0\",javax.xml.stream.events;uses:=\"javax.xml.namespace,javax.xml.stream\";version=\"1.0.0 [...]
- "felix.systempackages.calculate.uses":"true",
- "org.osgi.framework.system.packages":"org.osgi.framework;version=\"1.9\",org.osgi.framework.dto;version=\"1.8\";uses:=\"org.osgi.dto\",org.osgi.framework.hooks.bundle;version=\"1.1\";uses:=\"org.osgi.framework\",org.osgi.framework.hooks.resolver;version=\"1.0\";uses:=\"org.osgi.framework.wiring\",org.osgi.framework.hooks.service;version=\"1.1\";uses:=\"org.osgi.framework\",org.osgi.framework.hooks.weaving;version=\"1.1\";uses:=\"org.osgi.framework.wiring\",org.osgi.framework.laun [...]
- "felix.systempackages.substitution":"true",
- "sling.jre-jpms":"{dollar}{felix.jpms.java.base}{dollar}{felix.jpms.java.compiler}{dollar}{felix.jpms.java.datatransfer}{dollar}{felix.jpms.java.desktop}{dollar}{felix.jpms.java.instrument}{dollar}{felix.jpms.java.logging}{dollar}{felix.jpms.java.management}{dollar}{felix.jpms.java.management.rmi}{dollar}{felix.jpms.java.naming}{dollar}{felix.jpms.java.net.http}{dollar}{felix.jpms.java.prefs}{dollar}{felix.jpms.java.rmi}{dollar}{felix.jpms.java.scripting}{dollar}{felix.jpms.java. [...]
- "sling.jpms.java.xml":"{dollar}{sling.jre.java.xml},javax.xml.catalog;uses:=\"javax.xml.namespace\";version=\"1.0.0\"",
- "sling.jre-1.8":",java.applet;version=\"{dollar}{felix.detect.java.version}\",java.awt;version=\"{dollar}{felix.detect.java.version}\",java.awt.color;version=\"{dollar}{felix.detect.java.version}\",java.awt.datatransfer;version=\"{dollar}{felix.detect.java.version}\",java.awt.dnd;version=\"{dollar}{felix.detect.java.version}\",java.awt.event;version=\"{dollar}{felix.detect.java.version}\",java.awt.font;version=\"{dollar}{felix.detect.java.version}\",java.awt.geom;version=\"{dolla [...]
- }
+ ]
}
\ No newline at end of file
[sling-org-apache-sling-starter] 02/08: 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 f027f786ad9b34e9b718ebf82c3aa2e9356407ef
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Aug 17 22:15:54 2020 +0200
SLING-9636 - Refine feature model files
Use less verbose names for feature files.
---
src/main/features/{sling_sling.json => base.json} | 2 +-
src/main/features/{boot_boot.json => boot.json} | 0
src/main/features/{sling-caconfig_sling-caconfig.json => caconfig.json} | 2 +-
src/main/features/{composum_composum-nodes.json => composum.json} | 2 +-
.../features/{sling-discovery_sling-discovery.json => discovery.json} | 2 +-
src/main/features/{sling-event_sling-event.json => event.json} | 2 +-
src/main/features/{healthcheck_healthcheck.json => healthcheck.json} | 0
src/main/features/{launchpad_launchpad.json => launchpad.json} | 0
...exporter_models-jacksonexporter.json => models-jacksonexporter.json} | 2 +-
src/main/features/{oak_oak.json => oak.json} | 0
src/main/features/{repoinit_repoinit.json => repoinit.json} | 0
src/main/features/{scripting_sling.json => scripting.json} | 2 +-
src/main/features/{sling_slingshot.json => slingshot.json} | 2 +-
src/main/features/{standalone_standalone.json => standalone.json} | 0
.../{sling-validation_sling-validation.json => validation.json} | 2 +-
src/main/features/{webapp_webapp.json => webapp.json} | 0
16 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/features/sling_sling.json b/src/main/features/base.json
similarity index 99%
rename from src/main/features/sling_sling.json
rename to src/main/features/base.json
index 1ff583e..1051826 100644
--- a/src/main/features/sling_sling.json
+++ b/src/main/features/base.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:sling:12-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.starter:slingfeature:base:12-SNAPSHOT",
"bundles":[
{
"id":"commons-codec:commons-codec:1.14",
diff --git a/src/main/features/boot_boot.json b/src/main/features/boot.json
similarity index 100%
rename from src/main/features/boot_boot.json
rename to src/main/features/boot.json
diff --git a/src/main/features/sling-caconfig_sling-caconfig.json b/src/main/features/caconfig.json
similarity index 96%
rename from src/main/features/sling-caconfig_sling-caconfig.json
rename to src/main/features/caconfig.json
index 0f88578..258a3a8 100644
--- a/src/main/features/sling-caconfig_sling-caconfig.json
+++ b/src/main/features/caconfig.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:sling-caconfig:12-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.starter:slingfeature:caconfig:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.caconfig.api:1.2.0",
diff --git a/src/main/features/composum_composum-nodes.json b/src/main/features/composum.json
similarity index 96%
rename from src/main/features/composum_composum-nodes.json
rename to src/main/features/composum.json
index 7b50199..dc91b6b 100644
--- a/src/main/features/composum_composum-nodes.json
+++ b/src/main/features/composum.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:composum_composum-nodes:12-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.starter:slingfeature:composum:12-SNAPSHOT",
"bundles":[
{
"id":"com.composum.sling.core:composum-sling-core-commons:${composum.nodes.version}",
diff --git a/src/main/features/sling-discovery_sling-discovery.json b/src/main/features/discovery.json
similarity index 97%
rename from src/main/features/sling-discovery_sling-discovery.json
rename to src/main/features/discovery.json
index e2c7890..d8eea26 100644
--- a/src/main/features/sling-discovery_sling-discovery.json
+++ b/src/main/features/discovery.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:sling-discovery:12-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.starter:slingfeature:discovery:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.discovery.api:1.0.4",
diff --git a/src/main/features/sling-event_sling-event.json b/src/main/features/event.json
similarity index 97%
rename from src/main/features/sling-event_sling-event.json
rename to src/main/features/event.json
index 0063940..feccdf1 100644
--- a/src/main/features/sling-event_sling-event.json
+++ b/src/main/features/event.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:sling-event:12-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.starter:slingfeature:event:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.event.dea:1.1.4",
diff --git a/src/main/features/healthcheck_healthcheck.json b/src/main/features/healthcheck.json
similarity index 100%
rename from src/main/features/healthcheck_healthcheck.json
rename to src/main/features/healthcheck.json
diff --git a/src/main/features/launchpad_launchpad.json b/src/main/features/launchpad.json
similarity index 100%
rename from src/main/features/launchpad_launchpad.json
rename to src/main/features/launchpad.json
diff --git a/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json b/src/main/features/models-jacksonexporter.json
similarity index 90%
rename from src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json
rename to src/main/features/models-jacksonexporter.json
index 547488c..ef43a6d 100644
--- a/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json
+++ b/src/main/features/models-jacksonexporter.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:sling-models-jacksonexporter_models-jacksonexporter:12-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.starter:slingfeature:models-jacksonexporter:12-SNAPSHOT",
"bundles":[
{
"id":"com.fasterxml.jackson.core:jackson-annotations:${jackson.version}",
diff --git a/src/main/features/oak_oak.json b/src/main/features/oak.json
similarity index 100%
rename from src/main/features/oak_oak.json
rename to src/main/features/oak.json
diff --git a/src/main/features/repoinit_repoinit.json b/src/main/features/repoinit.json
similarity index 100%
rename from src/main/features/repoinit_repoinit.json
rename to src/main/features/repoinit.json
diff --git a/src/main/features/scripting_sling.json b/src/main/features/scripting.json
similarity index 98%
rename from src/main/features/scripting_sling.json
rename to src/main/features/scripting.json
index 5310167..61be4c0 100644
--- a/src/main/features/scripting_sling.json
+++ b/src/main/features/scripting.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:scripting_sling:12-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.starter:slingfeature:scripting:12-SNAPSHOT",
"bundles":[
{
"id":"org.antlr:antlr4-runtime:4.7.2",
diff --git a/src/main/features/sling_slingshot.json b/src/main/features/slingshot.json
similarity index 97%
rename from src/main/features/sling_slingshot.json
rename to src/main/features/slingshot.json
index 9513782..2e1f66c 100644
--- a/src/main/features/sling_slingshot.json
+++ b/src/main/features/slingshot.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:sling_slingshot:12-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.starter:slingfeature:slingshot:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.sample.slingshot:0.9.0",
diff --git a/src/main/features/standalone_standalone.json b/src/main/features/standalone.json
similarity index 100%
rename from src/main/features/standalone_standalone.json
rename to src/main/features/standalone.json
diff --git a/src/main/features/sling-validation_sling-validation.json b/src/main/features/validation.json
similarity index 96%
rename from src/main/features/sling-validation_sling-validation.json
rename to src/main/features/validation.json
index f035846..dae4076 100644
--- a/src/main/features/sling-validation_sling-validation.json
+++ b/src/main/features/validation.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.starter:slingfeature:sling-validation:12-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.starter:slingfeature:validation:12-SNAPSHOT",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.models.validation-impl:1.0.0",
diff --git a/src/main/features/webapp_webapp.json b/src/main/features/webapp.json
similarity index 100%
rename from src/main/features/webapp_webapp.json
rename to src/main/features/webapp.json
[sling-org-apache-sling-starter] 05/08: 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 7e106d04e2f78d6a6ef37bf1698d24e887acd8da
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Aug 17 22:59:08 2020 +0200
SLING-9636 - Refine feature model files
Move repoinit to the base feature. Using the base feature without repoinit
does not work, and apparently there is a race condition (or ordering problem)
where the jcr installer starts and is unable to find a service user mapping.
This was exposed when renaming the files and potentially altering startup/
processing order.
---
src/main/features/base.json | 72 ++++++++++++++++++++++++++++++++++++++--
src/main/features/repoinit.json | 73 -----------------------------------------
2 files changed, 70 insertions(+), 75 deletions(-)
diff --git a/src/main/features/base.json b/src/main/features/base.json
index 48ebaff..e184232 100644
--- a/src/main/features/base.json
+++ b/src/main/features/base.json
@@ -340,7 +340,19 @@
{
"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",
+ "start-order":"20"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.provisioning.model:1.8.6",
+ "start-order":"20"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.2",
+ "start-order":"20"
+ }
],
"configurations":{
"org.apache.sling.commons.log.LogManager":{
@@ -443,5 +455,61 @@
"org.apache.sling.xss=sling-xss"
]
}
- }
+ },
+ "repoinit:TEXT|true":[
+ "# general",
+ "create path (sling:OrderedFolder) /content",
+ "set ACL for everyone",
+ "allow jcr:read\ton /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\tjcr:read\ton\t/",
+ "allow\trep:write\ton /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:namespaceManagement,jcr:nodeTypeDefinitionManagement on :repository",
+ "end"
+ ]
}
diff --git a/src/main/features/repoinit.json b/src/main/features/repoinit.json
deleted file mode 100644
index 840909e..0000000
--- a/src/main/features/repoinit.json
+++ /dev/null
@@ -1,73 +0,0 @@
-
-{
- "bundles":[
- {
- "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.24",
- "start-order":"20"
- },
- {
- "id":"org.apache.sling:org.apache.sling.provisioning.model:1.8.6",
- "start-order":"20"
- },
- {
- "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.2",
- "start-order":"20"
- }
- ],
- "repoinit:TEXT|true":[
- "# general",
- "create path (sling:OrderedFolder) /content",
- "set ACL for everyone",
- "allow jcr:read\ton /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\tjcr:read\ton\t/",
- "allow\trep:write\ton /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:namespaceManagement,jcr:nodeTypeDefinitionManagement on :repository",
- "end"
- ]
-}
[sling-org-apache-sling-starter] 07/08: 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 e6764241d3dde2867ec5805005b1b605f59bd144
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Aug 17 23:06:25 2020 +0200
SLING-9636 - Refine feature model files
Remove the launchpad bundle and associated feature.
---
src/main/features/boot.json | 1 -
src/main/features/launchpad.json | 9 ---------
2 files changed, 10 deletions(-)
diff --git a/src/main/features/boot.json b/src/main/features/boot.json
index 365c8d8..ab52b1a 100644
--- a/src/main/features/boot.json
+++ b/src/main/features/boot.json
@@ -128,7 +128,6 @@
],
"framework-properties":{
- "sling.run.mode.install.options":"oak_tar,oak_mongo",
"localIndexDir":"${sling.home}/repository/index",
"repository.home":"${sling.home}/repository",
"sling.jre.java.xml":",javax.xml;version=\"2.1.0\",javax.xml.datatype;uses:=\"javax.xml.namespace\";version=\"2.1.0\",javax.xml.namespace;version=\"2.1.0\",javax.xml.parsers;uses:=\"javax.xml.validation,org.w3c.dom,org.xml.sax,org.xml.sax.helpers\";version=\"2.1.0\",javax.xml.stream;uses:=\"javax.xml.namespace,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform\";version=\"1.0.0\",javax.xml.stream.events;uses:=\"javax.xml.namespace,javax.xml.stream\";version=\"1.0.0 [...]
diff --git a/src/main/features/launchpad.json b/src/main/features/launchpad.json
deleted file mode 100644
index 965ea25..0000000
--- a/src/main/features/launchpad.json
+++ /dev/null
@@ -1,9 +0,0 @@
-
-{
- "bundles":[
- {
- "id":"org.apache.sling:org.apache.sling.launchpad.base:6.0.2-2.6.36",
- "start-order":"20"
- }
- ]
-}
\ No newline at end of file