You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/01/28 18:44:04 UTC

svn commit: r1439521 - in /karaf/cave/trunk/server: http/pom.xml storage/pom.xml

Author: jbonofre
Date: Mon Jan 28 17:44:03 2013
New Revision: 1439521

URL: http://svn.apache.org/viewvc?rev=1439521&view=rev
Log:
[KARAF-2145] Extend org.osgi.framework version range to support several Karaf versions

Modified:
    karaf/cave/trunk/server/http/pom.xml
    karaf/cave/trunk/server/storage/pom.xml

Modified: karaf/cave/trunk/server/http/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cave/trunk/server/http/pom.xml?rev=1439521&r1=1439520&r2=1439521&view=diff
==============================================================================
--- karaf/cave/trunk/server/http/pom.xml (original)
+++ karaf/cave/trunk/server/http/pom.xml Mon Jan 28 17:44:03 2013
@@ -68,6 +68,7 @@
                         </Export-Package>
                         <Import-Package>
                             org.apache.karaf.cave.server.api*;version=${project.version},
+                            org.osgi.framework;version="[1,4)",
                             *
                         </Import-Package>
                         <Webapp-Context>/cave</Webapp-Context>

Modified: karaf/cave/trunk/server/storage/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cave/trunk/server/storage/pom.xml?rev=1439521&r1=1439520&r2=1439521&view=diff
==============================================================================
--- karaf/cave/trunk/server/storage/pom.xml (original)
+++ karaf/cave/trunk/server/storage/pom.xml Mon Jan 28 17:44:03 2013
@@ -73,7 +73,7 @@
                             org.apache.karaf.cave.server.api;version="${project.version}",
                             org.slf4j*;resolution:=optional,
                             org.apache.felix.bundlerepository*;version="[2,3)",
-                            org.osgi.framework,
+                            org.osgi.framework;version="[1,4)",
                             org.osgi.service.blueprint,
                             org.osgi.service.log,
                             org.osgi.service.url,
@@ -83,7 +83,7 @@
                             !org.apache.felix.shell,
                             !org.apache.felix.bundlerepository.impl.wrapper,
                             !org.osgi.service.obr,
-                            !javax.xml.stream,
+                            !javax.xml.stream
                         </Import-Package>
                         <Private-Package>
                             org.kxml2.io,