This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch feature/SLING-9595 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit a67702b0afcd46b6d1b0aa60d278361f31484598 Author: Robert Munteanu <[email protected]> AuthorDate: Wed Aug 5 19:07:39 2020 +0200 SLING-9595 - Fully switch starter build to the feature model Catch up with latest changes from the master branch --- src/main/features/boot_boot.json | 13 +++++++++---- src/main/features/composum_composum-nodes.json | 14 +++++++------- src/main/features/repoinit_repoinit.json | 8 ++++---- src/main/features/sling_sling.json | 6 +++--- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/main/features/boot_boot.json b/src/main/features/boot_boot.json index 62c0e3b..d747199 100644 --- a/src/main/features/boot_boot.json +++ b/src/main/features/boot_boot.json @@ -58,7 +58,7 @@ "start-order":"1" }, { - "id":"org.apache.sling:org.apache.sling.commons.johnzon:1.2.2", + "id":"org.apache.sling:org.apache.sling.commons.johnzon:1.2.4", "start-order":"1" }, { @@ -82,7 +82,7 @@ "start-order":"1" }, { - "id":"org.apache.sling:org.apache.sling.installer.provider.file:1.2.2", + "id":"org.apache.sling:org.apache.sling.installer.provider.file:1.3.0", "start-order":"1" }, { @@ -90,7 +90,7 @@ "start-order":"1" }, { - "id":"org.apache.sling:org.apache.sling.settings:1.3.10", + "id":"org.apache.sling:org.apache.sling.settings:1.4.0", "start-order":"1" }, { @@ -124,11 +124,16 @@ { "id":"org.slf4j:slf4j-api:1.7.25", "start-order":"1" + }, + { + "id":"org.apache.felix:org.apache.felix.scr:2.1.20", + "start-order":"1" } + ], "framework-properties":{ "sling.run.mode.install.options":"oak_tar,oak_mongo", "localIndexDir":"${sling.home}/repository/index", "repository.home":"${sling.home}/repository" } -} \ No newline at end of file +} diff --git a/src/main/features/composum_composum-nodes.json b/src/main/features/composum_composum-nodes.json index 7d69770..408ceb3 100644 --- a/src/main/features/composum_composum-nodes.json +++ b/src/main/features/composum_composum-nodes.json @@ -2,27 +2,27 @@ { "id":"org.apache.sling:org.apache.sling.starter:slingfeature:composum_composum-nodes:12-SNAPSHOT", "variables":{ - "composum.nodes.version":"1.11.5" + "composum.nodes.version":"1.12.0" }, "bundles":[ { - "id":"com.composum.sling.core:composum-sling-core-commons:1.11.5", + "id":"com.composum.sling.core:composum-sling-core-commons:1.12.0", "start-order":"20" }, { - "id":"com.composum.sling.core:composum-sling-core-console:1.11.5", + "id":"com.composum.sling.core:composum-sling-core-console:1.12.0", "start-order":"20" }, { - "id":"com.composum.sling.core:composum-sling-core-jslibs:1.11.5", + "id":"com.composum.sling.core:composum-sling-core-jslibs:1.12.0", "start-order":"20" }, { - "id":"com.composum.sling.core:composum-sling-package-manager:1.11.5", + "id":"com.composum.sling.core:composum-sling-package-manager:1.12.0", "start-order":"20" }, { - "id":"com.composum.sling.core:composum-sling-user-management:1.11.5", + "id":"com.composum.sling.core:composum-sling-user-management:1.12.0", "start-order":"20" } ], @@ -36,4 +36,4 @@ "whitelist.name":"composum" } } -} \ No newline at end of file +} diff --git a/src/main/features/repoinit_repoinit.json b/src/main/features/repoinit_repoinit.json index 819b518..f1f18e3 100644 --- a/src/main/features/repoinit_repoinit.json +++ b/src/main/features/repoinit_repoinit.json @@ -3,15 +3,15 @@ "id":"org.apache.sling:org.apache.sling.starter:slingfeature:repoinit:12-SNAPSHOT", "bundles":[ { - "id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.20", + "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.4", + "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.4.2", + "id":"org.apache.sling:org.apache.sling.repoinit.parser:1.6.2", "start-order":"20" } ], @@ -71,4 +71,4 @@ "allow jcr:namespaceManagement,jcr:nodeTypeDefinitionManagement on :repository", "end" ] -} \ No newline at end of file +} diff --git a/src/main/features/sling_sling.json b/src/main/features/sling_sling.json index 1ddf965..e40c868 100644 --- a/src/main/features/sling_sling.json +++ b/src/main/features/sling_sling.json @@ -102,7 +102,7 @@ "start-order":"20" }, { - "id":"org.apache.sling:org.apache.sling.installer.provider.jcr:3.2.2", + "id":"org.apache.sling:org.apache.sling.installer.provider.jcr:3.3.0", "start-order":"20" }, { @@ -318,7 +318,7 @@ "start-order":"15" }, { - "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager:3.0.4", + "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager:3.0.6", "start-order":"20" }, { @@ -448,4 +448,4 @@ ] } } -} \ No newline at end of file +}
