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:05 UTC
[sling-org-apache-sling-karaf-features] branch master updated
(6571e61 -> 3859f17)
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-features.git.
from 6571e61 SLING-8769 Remove feature sling-extensions-threaddump
new 6efcfa2 SLING-8881 Rename feature composum into composum-nodes
new 3859f17 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:
src/main/feature/feature.xml | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
[sling-org-apache-sling-karaf-features] 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-features.git
commit 6efcfa2e62a8700f4bfe88f251d360b9e1b58ee9
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Dec 5 18:07:06 2019 +0100
SLING-8881 Rename feature composum into composum-nodes
---
src/main/feature/feature.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 7fcc087..395a85b 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -586,7 +586,7 @@
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-auth-form</feature>
<feature version="${project.version}">sling-scripting-javascript</feature>
- <feature version="${project.version}">composum</feature>
+ <feature version="${project.version}">composum-nodes</feature>
</feature>
<!-- Apache Felix Healthcheck -->
<feature name="felix-healthcheck" version="${project.version}">
@@ -685,8 +685,8 @@
<feature version="${project.version}">sling-auth-form</feature>
</feature>
<!-- Composum -->
- <feature name="composum" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum</config>
+ <feature name="composum-nodes" version="${project.version}">
+ <config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum_nodes">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum_nodes</config>
<bundle>mvn:com.composum.sling.core/composum-sling-core-commons/1.11.5</bundle>
<bundle>mvn:com.composum.sling.core/composum-sling-core-config/1.11.5</bundle>
<bundle>mvn:com.composum.sling.core/composum-sling-core-console/1.11.5</bundle>
[sling-org-apache-sling-karaf-features] 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-features.git
commit 3859f1708d16c78e36c41fa453bc8d5f931fa252
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Dec 5 18:17:38 2019 +0100
SLING-8882 Factor out Thymeleaf from sling-scripting-thymeleaf into new feature thymeleaf
---
src/main/feature/feature.xml | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 395a85b..bfd8880 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -559,14 +559,10 @@
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf</config>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.thymeleaf/2.0.2</bundle>
<!-- dependencies -->
+ <feature version="${project.version}">thymeleaf</feature>
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-scripting</feature>
<feature version="${project.version}">sling-i18n</feature>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.thymeleaf/3.0.11.RELEASE_1</bundle>
- <bundle dependency="true">mvn:org.attoparser/attoparser/2.0.5.RELEASE</bundle>
- <bundle dependency="true">mvn:org.unbescape/unbescape/1.1.6.RELEASE</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/3.2.1_1</bundle>
- <bundle dependency="true">mvn:org.javassist/javassist/3.26.0-GA</bundle>
</feature>
<!-- Apache Sling Servlets -->
<feature name="sling-servlets" version="${project.version}">
@@ -702,4 +698,12 @@
<feature version="${project.version}">sling-event</feature>
<feature version="${project.version}">jackrabbit-vault</feature>
</feature>
+ <!-- Thymeleaf -->
+ <feature name="thymeleaf" version="${project.version}">
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.thymeleaf/3.0.11.RELEASE_1</bundle>
+ <bundle dependency="true">mvn:org.attoparser/attoparser/2.0.5.RELEASE</bundle>
+ <bundle dependency="true">mvn:org.unbescape/unbescape/1.1.6.RELEASE</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/3.2.1_1</bundle>
+ <bundle dependency="true">mvn:org.javassist/javassist/3.26.0-GA</bundle>
+ </feature>
</features>