You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2019/12/05 19:15:25 UTC
[sling-org-apache-sling-karaf-distribution] branch master updated
(0f8eb8e -> 5a4551a)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-distribution.git.
from 0f8eb8e SLING-8769 Remove feature sling-extensions-threaddump
new 268ed24 SLING-8881 Rename feature composum into composum-nodes
new 5a4551a SLING-8882 Factor out Thymeleaf from sling-scripting-thymeleaf into new feature thymeleaf
The 2 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 | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
[sling-org-apache-sling-karaf-distribution] 02/02: SLING-8882
Factor out Thymeleaf from sling-scripting-thymeleaf into new feature
thymeleaf
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-distribution.git
commit 5a4551a5019e1bfc6135ed148db6c011ee846fa6
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Dec 5 18:17:53 2019 +0100
SLING-8882 Factor out Thymeleaf from sling-scripting-thymeleaf into new feature thymeleaf
---
pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pom.xml b/pom.xml
index bad1d17..751a21a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -537,6 +537,8 @@
<feature>sling-samples-fling</feature>
<!-- Composum -->
<feature>composum-nodes</feature>
+ <!-- Thymeleaf -->
+ <feature>thymeleaf</feature>
</installedFeatures>
<startupFeatures>
<feature>eventadmin</feature>
[sling-org-apache-sling-karaf-distribution] 01/02: SLING-8881
Rename feature composum into composum-nodes
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-distribution.git
commit 268ed24949d54e354b30c9b00072ef7830e65123
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Dec 5 18:09:36 2019 +0100
SLING-8881 Rename feature composum into composum-nodes
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index bdbf171..bad1d17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,7 +166,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
<version>0.1.1-SNAPSHOT</version>
- <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum</classifier>
+ <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum_nodes</classifier>
<type>config</type>
<scope>runtime</scope>
</dependency>
@@ -536,7 +536,7 @@
<!-- Apache Sling Samples -->
<feature>sling-samples-fling</feature>
<!-- Composum -->
- <feature>composum</feature>
+ <feature>composum-nodes</feature>
</installedFeatures>
<startupFeatures>
<feature>eventadmin</feature>