You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by da...@apache.org on 2014/05/05 10:34:57 UTC

svn commit: r1592467 - /felix/trunk/bundlerepository/pom.xml

Author: davidb
Date: Mon May  5 08:34:57 2014
New Revision: 1592467

URL: http://svn.apache.org/r1592467
Log:
Add Import-Package org.osgi.service.repository;resolution:=mandatory as otherwise its made optional for some reason.

Modified:
    felix/trunk/bundlerepository/pom.xml

Modified: felix/trunk/bundlerepository/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/pom.xml?rev=1592467&r1=1592466&r2=1592467&view=diff
==============================================================================
--- felix/trunk/bundlerepository/pom.xml (original)
+++ felix/trunk/bundlerepository/pom.xml Mon May  5 08:34:57 2014
@@ -123,7 +123,16 @@
                 org.apache.felix.bundlerepository.impl.*,
                 org.apache.felix.utils.*
             </Private-Package>
-            <Import-Package>!javax.xml.parsers,!org.xml.sax,org.osgi.service.log;resolution:=optional,org.osgi.service.obr;resolution:=optional,javax.xml.stream;resolution:=optional,*</Import-Package>
+            <!-- The org.osgi.service.repository;resolution:=mandatory seems strange below, but otherwise the maven-bundle-plugin
+                 will make that import optional, which we don't want... -->
+            <Import-Package>
+                !javax.xml.parsers,
+                !org.xml.sax,
+                org.osgi.service.repository;resolution:=mandatory,
+                org.osgi.service.log;resolution:=optional,
+                org.osgi.service.obr;resolution:=optional,
+                javax.xml.stream;resolution:=optional,
+                *</Import-Package>
             <DynamicImport-Package>org.apache.felix.shell</DynamicImport-Package>
             <Bundle-Activator>${project.artifactId}.impl.Activator</Bundle-Activator>
             <Bundle-DocURL>http://felix.apache.org/site/apache-felix-osgi-bundle-repository.html</Bundle-DocURL>