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/23 12:03:24 UTC
[sling-org-apache-sling-starter] branch
feature/SLING-9595-with-variables updated: Missed sfl4j and composum
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch feature/SLING-9595-with-variables
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
The following commit(s) were added to refs/heads/feature/SLING-9595-with-variables by this push:
new f8437a7 Missed sfl4j and composum
f8437a7 is described below
commit f8437a7a3865b938b35ca0e782be30ac903f26be
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Jul 23 08:03:11 2020 -0400
Missed sfl4j and composum
---
pom.xml | 3 ++-
src/main/features/boot_boot.json | 9 +++------
src/main/features/composum_composum-nodes.json | 13 +++++--------
3 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8b2b8be..8b44755 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
<properties>
<sling.java.version>8</sling.java.version>
<IT.expected.bundles.count>126</IT.expected.bundles.count>
+ <composum.version>1.12.0</composum.version>
<jackrabbit.version>2.20.0</jackrabbit.version>
<jackson.version>2.11.1</jackson.version>
<oak.version>1.26.0</oak.version>
@@ -125,7 +126,7 @@
<goal>attach-featurearchives</goal>
</goals>
<configuration>
- <replacePropertyVariables>jackrabbit.version,jackson.version,oak.version,slf4j.version</replacePropertyVariables>
+ <replacePropertyVariables>composum.version,jackrabbit.version,jackson.version,oak.version,slf4j.version</replacePropertyVariables>
</configuration>
</execution>
</executions>
diff --git a/src/main/features/boot_boot.json b/src/main/features/boot_boot.json
index 62c0e3b..d4d6661 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..a0b65e7 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.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"
},
{
- "id":"com.composum.sling.core:composum-sling-user-management:1.12.0",
+ "id":"com.composum.sling.core:composum-sling-user-management:${composum.version}",
"start-order":"20"
}
],