Author: gnodet
Date: Wed Nov 20 09:58:32 2013
New Revision: 1543750
URL: http://svn.apache.org/r1543750
Log:
[FELIX-4316] Packages imported dynamically should also be imported statically
with an optional flag
Modified:
felix/trunk/configadmin/pom.xml
felix/trunk/eventadmin/impl/pom.xml
felix/trunk/scr/pom.xml
Modified: felix/trunk/configadmin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/pom.xml?rev=1543750&r1=1543749&r2=1543750&view=diff
==============================================================================
--- felix/trunk/configadmin/pom.xml (original)
+++ felix/trunk/configadmin/pom.xml Wed Nov 20 09:58:32 2013
@@ -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>
Modified: felix/trunk/eventadmin/impl/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/pom.xml?rev=1543750&r1=1543749&r2=1543750&view=diff
==============================================================================
--- felix/trunk/eventadmin/impl/pom.xml (original)
+++ felix/trunk/eventadmin/impl/pom.xml Wed Nov 20 09:58:32 2013
@@ -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>
Modified: felix/trunk/scr/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/pom.xml?rev=1543750&r1=1543749&r2=1543750&view=diff
==============================================================================
--- felix/trunk/scr/pom.xml (original)
+++ felix/trunk/scr/pom.xml Wed Nov 20 09:58:32 2013
@@ -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,
