FELIX-4787 : Update DS Implementation to R6
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1684339 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/bnd.bnd b/scr/bnd.bnd
index eda3b59..3795574 100644
--- a/scr/bnd.bnd
+++ b/scr/bnd.bnd
@@ -20,30 +20,23 @@
org.osgi.util.promise;version=1.0
Private-Package: org.apache.felix.scr.impl.*, \
- org.osgi.util.tracker;-split-package:=first, \
org.apache.felix.utils.extender
-# Configuration Admin is optional and dynamic, but allow eager wiring by importing it
-# Metatype import is optional and dynamic, but allow eager wiring by importing it
+# Configuration Admin is optional and dynamic, but allow eager wiring by importing it
+# LogService is optional but if present the R4.0 version 1.3 is sufficient.
+# Metatype import is optional and dynamic, but allow eager wiring by importing it
+# PackageAdmin is used to find reference types if the component's bundle does not import it.
+# R4.0 version 1.2 is sufficient.
# optional import for Gogo annotations
# The Felix Shell support is optional
-# Framework version 1.6 (from R4.3) is required
-# While the DS spec is based on R6 (because of prototype scope), this
-# implementation works on R4.3 as well; of course prototype scope is
-# not supported in that case.
-# LogService is optional but if present the R4.0 version 1.3 is sufficient.
-# PackageAdmin is used to find reference types if the component's bundle does not import it.
-# See BindMethod.getParameterClass(Class) for details. R4.0 version 1.2 is sufficient.
Import-Package: \
org.osgi.service.cm;version="[1.2,2)";resolution:=optional, \
+ 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.apache.felix.service.command;resolution:=optional, \
org.apache.felix.shell;provide:=true;resolution:=optional, \
- org.osgi.framework;version="[1.6,2)", \
- org.osgi.service.log;version="[1.3,2)";resolution:=optional, \
- org.osgi.service.packageadmin;version="[1.2,2)";resolution:=optional, \
- org.osgi.framework.wiring;version="[1.0,2)", \
- org.osgi.util.function;version="[1.0,2)", \
*
DynamicImport-Package: \