[FELIX-4316] Packages imported dynamically should also be imported statically with an optional flag
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1543750 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/configadmin/pom.xml b/configadmin/pom.xml
index e827068..0d15158 100644
--- a/configadmin/pom.xml
+++ b/configadmin/pom.xml
@@ -198,6 +198,7 @@
<Import-Package>
org.osgi.service.cm;version="[1.5,1.6)",
org.osgi.framework;version="[1.4,2)",
+ org.osgi.service.log;resolution:=optional;version="1.3",
*
</Import-Package>
<DynamicImport-Package>
diff --git a/eventadmin/impl/pom.xml b/eventadmin/impl/pom.xml
index 77af291..4686f55 100644
--- a/eventadmin/impl/pom.xml
+++ b/eventadmin/impl/pom.xml
@@ -78,7 +78,7 @@
</Bundle-Activator>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<DynamicImport-Package>
- org.osgi.service.log
+ org.osgi.service.log;version="[1.3,2)"
</DynamicImport-Package>
<Import-Package>
<!--
@@ -93,6 +93,11 @@
-->
org.osgi.service.metatype;version="[1.1,2)";resolution:=optional,
+ <!--
+ Optional import to back the dynamic import on org.osgi.service.log
+ -->
+ org.osgi.service.log;version="[1.3,2)";resolution:=optional,
+
<!-- default -->
*
</Import-Package>
diff --git a/scr/pom.xml b/scr/pom.xml
index 1ab40db..570a70f 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -261,6 +261,17 @@
</Private-Package>
<Import-Package>
<!--
+ Configuration Admin is optional and dynamic, but allow eager
+ wiring by importing it
+ -->
+ org.osgi.service.cm;version="[1.2,2)";resolution:=optional,
+
+ <!--
+ Metatype import is optional and dynamic, but allow eager
+ wiring by importing it
+ -->
+ org.osgi.service.metatype;version="[1.1,2)";resolution:=optional,
+ <!--
optional import for Gogo annotations
-->
org.apache.felix.service.command;resolution:=optional,