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/07/30 18:18:12 UTC
[sling-org-apache-sling-app-cms] 05/18: Using variables
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch SLING-8913-multiple-instance-types
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit d3cc8841940efe55bedf49ad612277057febac57
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Jul 24 14:37:04 2020 -0400
Using variables
---
feature/src/main/features/boot_boot.json | 11 +++----
feature/src/main/features/cms_cms.json | 20 +++++--------
.../src/main/features/composum_composum-nodes.json | 13 ++++----
.../src/main/features/healthcheck_healthcheck.json | 2 +-
feature/src/main/features/launchpad_launchpad.json | 2 +-
feature/src/main/features/oak_oak.json | 35 ++++++++++------------
feature/src/main/features/repoinit_repoinit.json | 2 +-
feature/src/main/features/scripting_sling.json | 2 +-
.../features/sling-caconfig_sling-caconfig.json | 2 +-
.../features/sling-discovery_sling-discovery.json | 2 +-
.../src/main/features/sling-event_sling-event.json | 2 +-
...els-jacksonexporter_models-jacksonexporter.json | 11 +++----
.../sling-validation_sling-validation.json | 2 +-
feature/src/main/features/sling_sling.json | 17 +++++------
.../src/main/features/standalone_standalone.json | 2 +-
feature/src/main/features/webapp_webapp.json | 2 +-
16 files changed, 54 insertions(+), 73 deletions(-)
diff --git a/feature/src/main/features/boot_boot.json b/feature/src/main/features/boot_boot.json
index 0fbf079..bf25bdf 100644
--- a/feature/src/main/features/boot_boot.json
+++ b/feature/src/main/features/boot_boot.json
@@ -1,9 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:boot:0.16.3-SNAPSHOT",
- "variables":{
- "slf4j.version":"1.7.25"
- },
+ "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:boot:${cms.version}",
"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/feature/src/main/features/cms_cms.json b/feature/src/main/features/cms_cms.json
index cd0a963..4bc76db 100644
--- a/feature/src/main/features/cms_cms.json
+++ b/feature/src/main/features/cms_cms.json
@@ -1,21 +1,17 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:cms:0.16.3-SNAPSHOT",
- "variables":{
- "oak.version":"1.26.0",
- "cms.version":"0.16.3-SNAPSHOT"
- },
+ "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:cms:${cms.version}",
"bundles":[
{
"id":"com.github.livesense:org.liveSense.fragment.sun.misc:1.0.5",
"start-order":"5"
},
{
- "id":"org.apache.sling:org.apache.sling.cms.api:0.16.3-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.cms.api:${cms.version}",
"start-order":"5"
},
{
- "id":"org.apache.sling:org.apache.sling.cms.ui:0.16.3-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.cms.ui:${cms.version}",
"start-order":"5"
},
{
@@ -43,11 +39,11 @@
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:oak-auth-external:1.26.0",
+ "id":"org.apache.jackrabbit:oak-auth-external:${oak.version}",
"start-order":"15"
},
{
- "id":"org.apache.jackrabbit:oak-auth-ldap:1.26.0",
+ "id":"org.apache.jackrabbit:oak-auth-ldap:${oak.version}",
"start-order":"15"
},
{
@@ -83,15 +79,15 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.cms.core:0.16.3-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.cms.core:${cms.version}",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.cms.reference:0.16.3-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.cms.reference:${cms.version}",
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.cms.transformer:0.16.3-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.cms.transformer:${cms.version}",
"start-order":"20"
},
{
diff --git a/feature/src/main/features/composum_composum-nodes.json b/feature/src/main/features/composum_composum-nodes.json
index acaf4bd..e299f16 100644
--- a/feature/src/main/features/composum_composum-nodes.json
+++ b/feature/src/main/features/composum_composum-nodes.json
@@ -1,24 +1,21 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:composum_composum-nodes:0.16.3-SNAPSHOT",
- "variables":{
- "composum.nodes.version":"1.12.0"
- },
+ "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:composum_composum-nodes:${cms.version}",
"bundles":[
{
- "id":"com.composum.sling.core:composum-sling-core-commons:1.12.0",
+ "id":"com.composum.sling.core:composum-sling-core-commons:${composum.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.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.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.version}",
"start-order":"20"
}
],
diff --git a/feature/src/main/features/healthcheck_healthcheck.json b/feature/src/main/features/healthcheck_healthcheck.json
index 06d0b5d..d60a075 100644
--- a/feature/src/main/features/healthcheck_healthcheck.json
+++ b/feature/src/main/features/healthcheck_healthcheck.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:healthcheck:0.16.3-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:healthcheck:${cms.version}",
"bundles":[
{
"id":"org.apache.felix:org.apache.felix.healthcheck.api:2.0.4",
diff --git a/feature/src/main/features/launchpad_launchpad.json b/feature/src/main/features/launchpad_launchpad.json
index acdb0b8..2d06b41 100644
--- a/feature/src/main/features/launchpad_launchpad.json
+++ b/feature/src/main/features/launchpad_launchpad.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:launchpad:0.16.3-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:launchpad:${cms.version}",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.launchpad.base:6.0.2-2.6.36",
diff --git a/feature/src/main/features/oak_oak.json b/feature/src/main/features/oak_oak.json
index 27f959c..37aa1d7 100644
--- a/feature/src/main/features/oak_oak.json
+++ b/feature/src/main/features/oak_oak.json
@@ -1,68 +1,65 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:oak:0.16.3-SNAPSHOT",
- "variables":{
- "oak.version":"1.26.0"
- },
+ "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:oak:${cms.version}",
"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"
},
{
@@ -70,7 +67,7 @@
"start-order":"16"
},
{
- "id":"org.apache.jackrabbit:oak-segment-tar:1.26.0",
+ "id":"org.apache.jackrabbit:oak-segment-tar:${oak.version}",
"run-modes":"oak_tar",
"start-order":"15"
}
diff --git a/feature/src/main/features/repoinit_repoinit.json b/feature/src/main/features/repoinit_repoinit.json
index 8327bc9..1b74940 100644
--- a/feature/src/main/features/repoinit_repoinit.json
+++ b/feature/src/main/features/repoinit_repoinit.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:repoinit:0.16.3-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:repoinit:${cms.version}",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.jcr.repoinit:1.1.24",
diff --git a/feature/src/main/features/scripting_sling.json b/feature/src/main/features/scripting_sling.json
index 915a006..3510ab0 100644
--- a/feature/src/main/features/scripting_sling.json
+++ b/feature/src/main/features/scripting_sling.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:scripting_sling:0.16.3-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:scripting_sling:${cms.version}",
"bundles":[
{
"id":"org.antlr:antlr4-runtime:4.7.2",
diff --git a/feature/src/main/features/sling-caconfig_sling-caconfig.json b/feature/src/main/features/sling-caconfig_sling-caconfig.json
index 91d46b2..739f8cc 100644
--- a/feature/src/main/features/sling-caconfig_sling-caconfig.json
+++ b/feature/src/main/features/sling-caconfig_sling-caconfig.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling-caconfig:0.16.3-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling-caconfig:${cms.version}",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.caconfig.api:1.2.0",
diff --git a/feature/src/main/features/sling-discovery_sling-discovery.json b/feature/src/main/features/sling-discovery_sling-discovery.json
index e4da74a..0388d5f 100644
--- a/feature/src/main/features/sling-discovery_sling-discovery.json
+++ b/feature/src/main/features/sling-discovery_sling-discovery.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling-discovery:0.16.3-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling-discovery:${cms.version}",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.discovery.api:1.0.4",
diff --git a/feature/src/main/features/sling-event_sling-event.json b/feature/src/main/features/sling-event_sling-event.json
index 2b236eb..3b6990e 100644
--- a/feature/src/main/features/sling-event_sling-event.json
+++ b/feature/src/main/features/sling-event_sling-event.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling-event:0.16.3-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling-event:${cms.version}",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.event.dea:1.1.4",
diff --git a/feature/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json b/feature/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json
index d7b04f6..e72f722 100644
--- a/feature/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json
+++ b/feature/src/main/features/sling-models-jacksonexporter_models-jacksonexporter.json
@@ -1,20 +1,17 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling-models-jacksonexporter_models-jacksonexporter:0.16.3-SNAPSHOT",
- "variables":{
- "jackson.version":"2.11.1"
- },
+ "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling-models-jacksonexporter_models-jacksonexporter:${cms.version}",
"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/feature/src/main/features/sling-validation_sling-validation.json b/feature/src/main/features/sling-validation_sling-validation.json
index 336a578..0c0eca3 100644
--- a/feature/src/main/features/sling-validation_sling-validation.json
+++ b/feature/src/main/features/sling-validation_sling-validation.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling-validation:0.16.3-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling-validation:${cms.version}",
"bundles":[
{
"id":"org.apache.sling:org.apache.sling.models.validation-impl:1.0.0",
diff --git a/feature/src/main/features/sling_sling.json b/feature/src/main/features/sling_sling.json
index 250f14b..8b13bac 100644
--- a/feature/src/main/features/sling_sling.json
+++ b/feature/src/main/features/sling_sling.json
@@ -1,9 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling:0.16.3-SNAPSHOT",
- "variables":{
- "jackrabbit.version":"2.20.0"
- },
+ "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:sling:${cms.version}",
"bundles":[
{
"id":"commons-codec:commons-codec:1.14",
@@ -270,27 +267,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"
},
{
diff --git a/feature/src/main/features/standalone_standalone.json b/feature/src/main/features/standalone_standalone.json
index e44e70d..d40be0a 100644
--- a/feature/src/main/features/standalone_standalone.json
+++ b/feature/src/main/features/standalone_standalone.json
@@ -1,6 +1,6 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:standalone:0.16.3-SNAPSHOT",
+ "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:standalone:${cms.version}",
"bundles":[
{
"id":"org.apache.felix:org.apache.felix.http.jetty:4.0.18",
diff --git a/feature/src/main/features/webapp_webapp.json b/feature/src/main/features/webapp_webapp.json
index f1e6022..191ea0b 100644
--- a/feature/src/main/features/webapp_webapp.json
+++ b/feature/src/main/features/webapp_webapp.json
@@ -1,4 +1,4 @@
{
- "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:webapp:0.16.3-SNAPSHOT"
+ "id":"org.apache.sling:org.apache.sling.cms.fmconverter:slingfeature:webapp:${cms.version}"
}
\ No newline at end of file