You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2020/02/25 07:57:39 UTC
[sling-org-apache-sling-installer-core] branch master updated:
SLING-9138 correctly embed Sling Commons OSGi and Felix Converter
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-core.git
The following commit(s) were added to refs/heads/master by this push:
new f3dc85b SLING-9138 correctly embed Sling Commons OSGi and Felix Converter
f3dc85b is described below
commit f3dc85be58a5f96095858f3be97abe868ffdc238
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Feb 25 08:56:53 2020 +0100
SLING-9138 correctly embed Sling Commons OSGi and Felix Converter
---
bnd.bnd | 9 +++++----
pom.xml | 6 ------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index 43b91b0..545a5af 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -1,8 +1,9 @@
--conditionalpackage: org.apache.felix.configurator.impl.*,\
+-conditionalpackage: org.apache.sling.commons.osgi.*,\
+ org.apache.felix.cm.*,\
+ org.apache.felix.configurator.impl.*,\
+ org.osgi.util.*,\
org.apache.sling.feature.io.*,\
javax.json.*,\
- org.apache.johnzon.core.*,\
- org.apache.felix.converter.*,\
- org.apache.felix.cm.*
+ org.apache.johnzon.core.*
Provide-Capability: osgi.service;objectClass:List<String>="org.apache.sling.installer.api.OsgiInstaller,org.apache.sling.installer.api.ResourceChangeListener,org.apache.sling.installer.api.info.InfoProvider,org.apache.sling.installer.api.tasks.RetryHandler",\
osgi.service;objectClass:List<String>="org.apache.sling.installer.api.event.InstallationListener,org.apache.sling.installer.api.jmx.InstallerMBean"
diff --git a/pom.xml b/pom.xml
index d2eef29..305fe18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,12 +204,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.utils</artifactId>
- <version>1.11.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.johnzon</artifactId>
<version>1.0.0</version>