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/04/03 05:17:26 UTC
[sling-org-apache-sling-karaf-features] 03/04: SLING-9299 Provide
Commons OSGi feature
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 faae0f7bc1449c944eaa2c92004efa2e786c6bbd
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Mar 30 14:20:14 2020 +0200
SLING-9299 Provide Commons OSGi feature
---
src/main/feature/feature.xml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 82a1333..2cb1bd5 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -31,7 +31,6 @@
<!-- Apache Sling Commons -->
<bundle>mvn:org.apache.sling/org.apache.sling.commons.johnzon/1.2.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.commons.mime/2.2.2</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.commons.osgi/2.4.0</bundle>
<!-- dependencies -->
<feature>config</feature>
<feature>eventadmin</feature>
@@ -40,6 +39,7 @@
<feature>http</feature>
<feature>http-whiteboard</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>
<feature version="${project.version}">sling-commons-threads</feature>
<bundle dependency="true">mvn:commons-codec/commons-codec/1.14</bundle>
@@ -88,7 +88,7 @@
<feature>scr</feature>
<feature>webconsole</feature>
<feature version="${project.version}">sling-commons-classloader</feature>
- <bundle dependency="true">mvn:org.apache.sling/org.apache.sling.commons.osgi/2.4.0</bundle>
+ <feature version="${project.version}">sling-commons-osgi</feature>
<bundle dependency="true">mvn:commons-io/commons-io/2.6</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.10</bundle>
</feature>
@@ -96,7 +96,7 @@
<bundle>mvn:org.apache.sling/org.apache.sling.commons.html/1.1.0</bundle>
<!-- dependencies -->
<feature>scr</feature>
- <bundle dependency="true">mvn:org.apache.sling/org.apache.sling.commons.osgi/2.4.0</bundle>
+ <feature version="${project.version}">sling-commons-osgi</feature>
</feature>
<feature name="sling-commons-messaging" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.commons.messaging/1.0.0</bundle>
@@ -118,6 +118,10 @@
<feature>scr</feature>
<bundle dependency="true">mvn:io.dropwizard.metrics/metrics-core/3.2.6</bundle>
</feature>
+ <feature name="sling-commons-osgi" version="${project.version}">
+ <bundle>mvn:org.apache.sling/org.apache.sling.commons.osgi/2.4.0</bundle>
+ <feature>eventadmin</feature>
+ </feature>
<feature name="sling-commons-scheduler" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.commons.scheduler/2.7.6</bundle>
<!-- dependencies -->