--- bnd.bnd.orig	2017-06-16 13:53:29.312595188 +0100
+++ bnd.bnd	2017-06-16 13:57:51.245747792 +0100
@@ -1,3 +1,4 @@
+Bundle-SymbolicName: org.apache.felix.scr
 Bundle-Category: osgi
 Bundle-DocURL: http://felix.apache.org/site/apache-felix-service-component-runtime.html
 Bundle-Activator: org.apache.felix.scr.impl.Activator
@@ -14,12 +15,7 @@
                    filter:="(|(&(osgi.ee=JavaSE)(version=1.6))(&(osgi.ee=JavaSE/compact1)(version=1.8)))"
 
 Export-Package: org.apache.felix.scr.component;version=1.1.0;provide:=true, \
- org.apache.felix.scr.info;version=1.0.0;provide:=true, \
- org.osgi.service.component;version=1.3;-split-package:=first;provide:=true, \
- org.osgi.service.component.runtime;version=1.3;provide:=true, \
- org.osgi.service.component.runtime.dto;version=1.3;provide:=true, \
- org.osgi.util.function;version=1.0, \
- org.osgi.util.promise;version=1.0
+ org.apache.felix.scr.info;version=1.0.0;provide:=true
 
 Private-Package: org.apache.felix.scr.impl.*
 
@@ -31,11 +27,20 @@
 # optional import for Gogo annotations 
 # The Felix Shell support is optional 
 Import-Package: \
+ org.kxml2.io,org.xmlpull.v1, \
+ org.osgi.framework;version="[1.8,2)", \
+ org.osgi.framework.dto;version="[1.8,2)", \
+ org.osgi.framework.wiring;version="[1.2,2)", \
  org.osgi.service.cm;version="[1.5,2)";resolution:=optional, \
+ org.osgi.service.component;version="[1.3,1.4)", \
+ org.osgi.service.component.runtime;version="[1.3,1.4)", \
+ org.osgi.service.component.runtime.dto;version="[1.3,1.4)", \
  org.osgi.service.log;version="[1.3,2)";resolution:=optional, \
  org.osgi.service.metatype;version="[1.1,2)";resolution:=optional, \
  org.osgi.service.packageadmin;version="[1.2,2)";resolution:=optional, \
  org.osgi.util.function;version="[1.0,2)", \
+ org.osgi.util.promise;version="[1.0,2)", \
+ org.osgi.util.tracker;version="[1.5,2)", \
  org.apache.felix.service.command;resolution:=optional, \
  org.apache.felix.shell;provide:=true;resolution:=optional, \
  *
@@ -44,4 +49,3 @@
  org.osgi.service.cm;version="[1.2,2)", \
  org.osgi.service.metatype;version="[1.1,2)"
 
-Embed-Dependency: kxml2;inline=org/kxml2/io/KXmlParser.class|org/xmlpull/v1/XmlPull**