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 2020/11/01 11:56:00 UTC
[sling-org-apache-sling-karaf-features] branch master updated
(599e838 -> 368c48f)
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 599e838 SLING-9865 Update to Sling (Bundle) Parent 40
new 9dfe551 SLING-3027 Improve Launchpad Karaf Features
new 64f6459 SLING-8990 Switch configurations to OSGi R7 configuration format
new dfaefdf SLING-3027 Improve Launchpad Karaf Features
new 2fb597e SLING-9837 Use OSGi R7 HTTP Service
new 368c48f SLING-9837 Use OSGi R7 HTTP Service
The 5 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 | 91 ++++++++++++++++++++++++++------------------
1 file changed, 53 insertions(+), 38 deletions(-)
[sling-org-apache-sling-karaf-features] 01/05: SLING-3027 Improve
Launchpad Karaf Features
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 9dfe55172acbcaf3bb26d6a28261a8815a913ca4
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Oct 30 23:18:40 2020 +0100
SLING-3027 Improve Launchpad Karaf Features
* Downgrade Sling API to 2.22.0
* Add missing capability
---
src/main/feature/feature.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index b9b89c1..86a9194 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -21,7 +21,7 @@
<!-- Apache Sling -->
<feature name="sling" version="${project.version}">
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver</config>
- <bundle>mvn:org.apache.sling/org.apache.sling.api/2.23.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.api/2.22.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.5.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.engine/2.7.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.7.0</bundle>
@@ -50,7 +50,8 @@
<bundle dependency="true">mvn:org.apache.commons/commons-math/2.2</bundle>
<bundle dependency="true">mvn:org.apache.felix/org.apache.felix.converter/1.0.14</bundle>
<capability>
- osgi.service;objectClass=org.apache.sling.engine.SlingRequestProcessor <!-- provided by engine -->
+ osgi.service;objectClass=org.apache.sling.engine.SlingRequestProcessor, <!-- provided by engine -->
+ osgi.service;objectClass=javax.servlet.ServletContext
</capability>
</feature>
<!-- Apache Sling Auth -->
[sling-org-apache-sling-karaf-features] 02/05: SLING-8990 Switch
configurations to OSGi R7 configuration format
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 64f6459741a9b0eb86b1d184ad76484d32444de8
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Oct 31 14:35:38 2020 +0100
SLING-8990 Switch configurations to OSGi R7 configuration format
use tilde as separator for factory configurations
---
src/main/feature/feature.xml | 68 ++++++++++++++++++++++----------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 86a9194..5ee1b95 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -20,7 +20,7 @@
<features name="sling-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.5.0">
<!-- Apache Sling -->
<feature name="sling" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver</config>
<bundle>mvn:org.apache.sling/org.apache.sling.api/2.22.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.5.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.engine/2.7.2</bundle>
@@ -152,8 +152,8 @@
<feature version="${project.version}">sling</feature>
</feature>
<feature name="sling-caconfig" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_caconfig">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_caconfig</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_caconfig">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_caconfig</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_caconfig">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_caconfig</config>
<bundle>mvn:org.apache.sling/org.apache.sling.caconfig.api/1.2.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.caconfig.impl/1.5.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.caconfig.spi/1.3.4</bundle>
@@ -164,8 +164,8 @@
<feature>webconsole</feature>
</feature>
<feature name="sling-clam" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_clam">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_clam</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_clam">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_clam</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_clam">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_clam</config>
<bundle>mvn:org.apache.sling/org.apache.sling.clam/1.1.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -179,9 +179,9 @@
<feature version="${project.version}">sling</feature>
</feature>
<feature name="sling-discovery-oak" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_discovery</config>
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_discovery</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_discovery</config>
+ <config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_discovery</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_discovery</config>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.base/2.0.8</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.commons/1.0.20</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.oak/1.2.30</bundle>
@@ -210,8 +210,8 @@
<feature version="${project.version}">jackrabbit-vault</feature>
</feature>
<feature name="sling-event" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_event">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_event</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_event">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_event</config>
<bundle>mvn:org.apache.sling/org.apache.sling.event/4.2.12</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.event.dea/1.1.4</bundle>
<!-- dependencies -->
@@ -244,8 +244,8 @@
<feature version="${project.version}">sling-scripting</feature>
</feature>
<feature name="sling-i18n" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_i18n">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_i18n</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_i18n">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_i18n</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_i18n">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_i18n</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_i18n">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_i18n</config>
<bundle>mvn:org.apache.sling/org.apache.sling.i18n/2.5.14</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -295,7 +295,7 @@
<bundle dependency="true">mvn:org.apache.felix/org.apache.felix.inventory/1.0.6</bundle>
</feature>
<feature name="sling-resource-presence" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resource_presence">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resource_presence</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resource_presence">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resource_presence</config>
<bundle>mvn:org.apache.sling/org.apache.sling.resource.presence/0.0.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -306,7 +306,7 @@
<feature version="${project.version}">sling</feature>
</feature>
<feature name="sling-rewriter" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_rewriter">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_rewriter</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_rewriter">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_rewriter</config>
<bundle>mvn:org.apache.sling/org.apache.sling.rewriter/1.2.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -324,8 +324,8 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.urlrewritefilter/4.0.4_1</bundle>
</feature>
<feature name="sling-validation" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_validation">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_validation</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_validation">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_validation</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_validation">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_validation</config>
<bundle>mvn:org.apache.sling/org.apache.sling.validation.api/1.0.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.validation.core/1.0.4</bundle>
<!-- dependencies -->
@@ -334,8 +334,8 @@
<feature version="${project.version}">sling-servlets</feature>
</feature>
<feature name="sling-xss" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_xss">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_xss</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_xss">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_xss</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_xss">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_xss</config>
<bundle>mvn:org.apache.sling/org.apache.sling.xss/2.2.6</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -373,8 +373,8 @@
<feature version="${project.version}">sling-installer</feature>
</feature>
<feature name="sling-installer-provider-jcr" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_installer_jcr">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_installer_jcr</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_installer_jcr">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_installer_jcr</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_jcr">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_jcr</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_installer_jcr">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_installer_jcr</config>
<bundle>mvn:org.apache.sling/org.apache.sling.installer.provider.jcr/3.3.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling-installer</feature>
@@ -382,8 +382,8 @@
</feature>
<!-- Apache Sling JCR -->
<feature name="sling-jcr" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_jcr_resource">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_jcr_resource</config>
+ <config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_resource">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_resource</config>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.api/2.4.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/3.1.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.3.0</bundle>
@@ -426,17 +426,17 @@
<feature name="sling-quickstart-oak" version="${project.version}"><!-- hidden="true" -->
<!-- Sling with Oak Repository and Felix Web Console -->
<!-- http://jackrabbit.apache.org/oak/docs/osgi_config.html -->
- <config external="true" name="org.apache.felix.jaas.Configuration.factory-GuestLoginModule">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.felix.jaas.Configuration.factory-GuestLoginModule</config>
- <config external="true" name="org.apache.felix.jaas.Configuration.factory-LoginModuleImpl">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.felix.jaas.Configuration.factory-LoginModuleImpl</config>
- <config external="true" name="org.apache.felix.jaas.Configuration.factory-TokenLoginModule">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.felix.jaas.Configuration.factory-TokenLoginModule</config>
+ <config external="true" name="org.apache.felix.jaas.Configuration.factory~GuestLoginModule">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.felix.jaas.Configuration.factory~GuestLoginModule</config>
+ <config external="true" name="org.apache.felix.jaas.Configuration.factory~LoginModuleImpl">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.felix.jaas.Configuration.factory~LoginModuleImpl</config>
+ <config external="true" name="org.apache.felix.jaas.Configuration.factory~TokenLoginModule">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.felix.jaas.Configuration.factory~TokenLoginModule</config>
<config external="true" name="org.apache.felix.jaas.ConfigurationSpi">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.felix.jaas.ConfigurationSpi</config>
<config external="true" name="org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl</config>
<config external="true" name="org.apache.jackrabbit.oak.security.user.UserConfigurationImpl">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.security.user.UserConfigurationImpl</config>
<config external="true" name="org.apache.jackrabbit.oak.security.user.RandomAuthorizableNodeName">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.security.user.RandomAuthorizableNodeName</config>
<config external="true" name="org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider</config>
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling</config>
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_mapping">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_mapping</config>
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_readall">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_readall</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall</config>
<!-- dependencies -->
<feature>webconsole</feature>
<feature version="${project.version}">sling</feature>
@@ -488,8 +488,8 @@
</feature>
<!-- Apache Sling Scripting -->
<feature name="sling-scripting" version="${project.version}">
- <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_scripting">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_scripting</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting</config>
+ <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting</config>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.api/2.2.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.core/2.2.0</bundle>
<!-- dependencies -->
@@ -539,7 +539,7 @@
<feature version="${project.version}">sling-caconfig</feature>
</feature>
<feature name="sling-scripting-htl" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_htl">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_htl</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_htl">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_htl</config>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.3.2-1.4.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.2.6-1.4.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.2.0-1.4.0</bundle>
@@ -558,7 +558,7 @@
<bundle dependency="true">mvn:org.antlr/antlr4-runtime/4.8-1</bundle>
</feature>
<feature name="sling-scripting-thymeleaf" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_thymeleaf">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_thymeleaf</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_thymeleaf">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_thymeleaf</config>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.thymeleaf/2.0.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">thymeleaf</feature>
@@ -568,7 +568,7 @@
</feature>
<!-- Apache Sling Servlets -->
<feature name="sling-servlets" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_servlets">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_servlets</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_servlets">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_servlets</config>
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.get/2.1.40</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.post/2.3.36</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.6.4</bundle>
@@ -679,7 +679,7 @@
<!-- Apache Sling Samples -->
<!-- Composum -->
<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>
+ <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.12.2</bundle>
<bundle>mvn:com.composum.sling.core/composum-sling-core-config/1.12.2</bundle>
<bundle>mvn:com.composum.sling.core/composum-sling-core-console/1.12.2</bundle>
[sling-org-apache-sling-karaf-features] 05/05: SLING-9837 Use OSGi
R7 HTTP Service
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 368c48f64133962c741962441ae3184dc119571c
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Nov 1 12:53:27 2020 +0100
SLING-9837 Use OSGi R7 HTTP Service
remove feature felix-http from sling (allows usage of other HTTP services)
---
src/main/feature/feature.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 58bfac5..f4e4c3d 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -35,7 +35,6 @@
<feature>eventadmin</feature>
<feature>scr</feature>
<feature>management</feature>
- <feature>felix-http</feature>
<feature version="${project.version}">sling-commons-fsclassloader</feature>
<feature version="${project.version}">sling-commons-osgi</feature>
<feature version="${project.version}">sling-commons-scheduler</feature>
[sling-org-apache-sling-karaf-features] 03/05: SLING-3027 Improve
Launchpad Karaf Features
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 dfaefdf35ff7d257bd63780d53748587301b8073
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Oct 31 14:42:28 2020 +0100
SLING-3027 Improve Launchpad Karaf Features
remove config bundle for Composum
---
src/main/feature/feature.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 5ee1b95..a0f1fd5 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -681,7 +681,6 @@
<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.12.2</bundle>
- <bundle>mvn:com.composum.sling.core/composum-sling-core-config/1.12.2</bundle>
<bundle>mvn:com.composum.sling.core/composum-sling-core-console/1.12.2</bundle>
<bundle>mvn:com.composum.sling.core/composum-sling-core-jslibs/1.12.2</bundle>
<bundle>mvn:com.composum.sling.core/composum-sling-user-management/1.12.2</bundle>
[sling-org-apache-sling-karaf-features] 04/05: SLING-9837 Use OSGi
R7 HTTP Service
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 2fb597ef796c42cfa4aaf3a97ccdaa1837f1ab9c
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Oct 31 16:13:45 2020 +0100
SLING-9837 Use OSGi R7 HTTP Service
add asm and spifly features for Groovy (bundles provided via Pax Web before)
---
src/main/feature/feature.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index a0f1fd5..58bfac5 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -510,6 +510,7 @@
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-scripting</feature>
+ <feature version="${project.version}">spifly</feature>
<bundle dependency="true">mvn:org.codehaus.groovy/groovy/3.0.1</bundle>
<bundle dependency="true">mvn:org.codehaus.groovy/groovy-json/3.0.1</bundle>
<bundle dependency="true">mvn:org.codehaus.groovy/groovy-templates/3.0.1</bundle>
@@ -702,4 +703,19 @@
<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.27.0-GA</bundle>
</feature>
+ <!-- asm -->
+ <feature name="asm" version="${project.version}">
+ <bundle>mvn:org.ow2.asm/asm/9.0</bundle>
+ <bundle>mvn:org.ow2.asm/asm-analysis/9.0</bundle>
+ <bundle>mvn:org.ow2.asm/asm-commons/9.0</bundle>
+ <bundle>mvn:org.ow2.asm/asm-util/9.0</bundle>
+ <bundle>mvn:org.ow2.asm/asm-tree/9.0</bundle>
+ </feature>
+ <!-- spifly -->
+ <feature name="spifly" version="${project.version}">
+ <bundle>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.3.2</bundle>
+ <!-- dependencies -->
+ <bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/1.1.3</bundle>
+ <feature version="${project.version}">asm</feature>
+ </feature>
</features>