|
 |
702950 |
From 2269816ee0bc1e24c9efc85d9dc7025975f66673 Mon Sep 17 00:00:00 2001
|
|
|
702950 |
From: Mat Booth <mat.booth@redhat.com>
|
|
|
702950 |
Date: Wed, 6 Mar 2019 10:19:20 +0000
|
|
|
702950 |
Subject: [PATCH] Use import-package instead of embedding dependencies
|
|
|
702950 |
|
|
|
702950 |
---
|
|
|
702950 |
bnd.bnd | 18 +++++++++++++-----
|
|
|
702950 |
1 file changed, 13 insertions(+), 5 deletions(-)
|
|
|
702950 |
|
|
|
702950 |
diff --git a/bnd.bnd b/bnd.bnd
|
|
|
702950 |
index 420c0e0..b53b2f8 100644
|
|
|
702950 |
--- a/bnd.bnd
|
|
|
702950 |
+++ b/bnd.bnd
|
|
|
702950 |
@@ -1,3 +1,4 @@
|
|
|
702950 |
+Bundle-SymbolicName: org.apache.felix.scr
|
|
|
702950 |
Bundle-Category: osgi
|
|
|
702950 |
Bundle-DocURL: http://felix.apache.org/site/apache-felix-service-component-runtime.html
|
|
|
702950 |
Bundle-Activator: org.apache.felix.scr.impl.Activator
|
|
|
702950 |
@@ -14,10 +15,7 @@ Require-Capability: osgi.ee;\
|
|
|
702950 |
filter:="(|(&(osgi.ee=JavaSE)(version=1.7))(&(osgi.ee=JavaSE/compact1)(version=1.8)))"
|
|
|
702950 |
|
|
|
702950 |
Export-Package: org.apache.felix.scr.component;version=1.1.0;provide:=true, \
|
|
|
702950 |
- org.apache.felix.scr.info;version=1.0.0;provide:=true, \
|
|
|
702950 |
- org.osgi.service.component;version=1.4;provide:=true, \
|
|
|
702950 |
- org.osgi.service.component.runtime;version=1.4;provide:=true, \
|
|
|
702950 |
- org.osgi.service.component.runtime.dto;version=1.4;provide:=true
|
|
|
702950 |
+ org.apache.felix.scr.info;version=1.0.0;provide:=true
|
|
|
702950 |
|
|
|
702950 |
Private-Package: org.apache.felix.scr.impl.*
|
|
|
702950 |
|
|
|
702950 |
@@ -28,6 +26,17 @@ Private-Package: org.apache.felix.scr.impl.*
|
|
|
702950 |
# R4.0 version 1.2 is sufficient.
|
|
|
702950 |
# optional import for Gogo annotations
|
|
|
702950 |
Import-Package: \
|
|
|
702950 |
+ org.kxml2.io,org.xmlpull.v1, \
|
|
|
702950 |
+ org.osgi.dto;version="[1.0,2)", \
|
|
|
702950 |
+ org.osgi.framework;version="[1.8,2)", \
|
|
|
702950 |
+ org.osgi.framework.dto;version="[1.8,2)", \
|
|
|
702950 |
+ org.osgi.framework.startlevel;version="[1.0,2)", \
|
|
|
702950 |
+ org.osgi.framework.wiring;version="[1.2,2)", \
|
|
|
702950 |
+ org.osgi.service.component;version="[1.4,1.5)", \
|
|
|
702950 |
+ org.osgi.service.component.runtime;version="[1.4,1.5)", \
|
|
|
702950 |
+ org.osgi.service.component.runtime.dto;version="[1.4,1.5)", \
|
|
|
702950 |
+ org.osgi.util.promise;version="[1.0,2)", \
|
|
|
702950 |
+ org.osgi.util.tracker;version="[1.5,2)", \
|
|
|
702950 |
org.osgi.service.cm;version="[1.6,2)";resolution:=optional, \
|
|
|
702950 |
org.osgi.service.log;version="[1.3,2)";resolution:=optional, \
|
|
|
702950 |
org.osgi.service.metatype;version="[1.2,2)";resolution:=optional, \
|
|
|
702950 |
@@ -40,4 +49,3 @@ DynamicImport-Package: \
|
|
|
702950 |
org.osgi.service.log;version="[1.3,2)", \
|
|
|
702950 |
org.osgi.service.metatype;version="[1.1,2)"
|
|
|
702950 |
|
|
|
702950 |
-Embed-Dependency: kxml2;inline=org/kxml2/io/KXmlParser.class|org/xmlpull/v1/XmlPull**
|
|
|
702950 |
--
|
|
|
702950 |
2.20.1
|
|
|
702950 |
|