karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [30/50] [abbrv] git commit: [KARAF-2145] Extend org.osgi.framework version range to support several Karaf versions
Date Wed, 18 Dec 2013 08:19:51 GMT
[KARAF-2145] Extend org.osgi.framework version range to support several Karaf versions

git-svn-id: https://svn.apache.org/repos/asf/karaf/cave/trunk@1439521 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/karaf-cave/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cave/commit/4ca662be
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cave/tree/4ca662be
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cave/diff/4ca662be

Branch: refs/heads/master
Commit: 4ca662befbb30b0a3c848a1daa7535cea69d34e9
Parents: 854d1f5
Author: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Mon Jan 28 17:44:03 2013 +0000
Committer: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Mon Jan 28 17:44:03 2013 +0000

----------------------------------------------------------------------
 server/http/pom.xml    | 1 +
 server/storage/pom.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/4ca662be/server/http/pom.xml
----------------------------------------------------------------------
diff --git a/server/http/pom.xml b/server/http/pom.xml
index 945a616..33b4abf 100644
--- a/server/http/pom.xml
+++ b/server/http/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/4ca662be/server/storage/pom.xml
----------------------------------------------------------------------
diff --git a/server/storage/pom.xml b/server/storage/pom.xml
index cf2b5c0..593ba53 100644
--- a/server/storage/pom.xml
+++ b/server/storage/pom.xml
@@ -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,


Mime
View raw message