FELIX-2578 Refactor SCR configuration setup to support late wiring of Configuration Admin API
Refactored configuration admin support into a support class and
unified component handling again. If Configuration Admin is there
the support class provides configuration, otherwise the support
class is not instantiated and components are not provided with
additional configuration.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1067145 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/pom.xml b/scr/pom.xml
index a5ee3c6..f076b0a 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -219,18 +219,6 @@
org.osgi.service.packageadmin;version="[1.2,2)";resolution:=optional,
<!--
- Configuration Admin version 1.2 (from R4.0) is enough
- (FELIX-2578: API is currently required)
- -->
- org.osgi.service.cm;version="[1.2,2)",
-
- <!--
- Metatype is optional and if it is
- present, version 1.1 (from R4.1) is enough
- -->
- org.osgi.service.metatype;version="[1.1,2)";resolution:=optional,
-
- <!--
SCR API is required (we also export it) and must
be of any 1.1 version, because we implement that
exact version. This import is only used if the
@@ -239,6 +227,18 @@
-->
org.osgi.service.component;version="[1.1,1.2)"
</Import-Package>
+ <DynamicImport-Package>
+ <!--
+ Configuration Admin version 1.2 (from R4.0) is enough
+ -->
+ org.osgi.service.cm;version="[1.2,2)",
+
+ <!--
+ Metatype is optional and if it is
+ present, version 1.1 (from R4.1) is enough
+ -->
+ org.osgi.service.metatype;version="[1.1,2)"
+ </DynamicImport-Package>
<Embed-Dependency>
kxml2
</Embed-Dependency>