From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 14 Nov 2017 08:05:35 +0000 (+0100)
Subject: Ignore OSGi Framework version
X-Git-Tag: argeo-commons-2.1.70~28
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=e1a286d273e84d7f47dd2b7fcf6c1b8b73f88ee5;p=lgpl%2Fargeo-commons.git

Ignore OSGi Framework version
---

diff --git a/org.argeo.cms.ui.workbench/bnd.bnd b/org.argeo.cms.ui.workbench/bnd.bnd
index d5dc91e30..9b38202e0 100644
--- a/org.argeo.cms.ui.workbench/bnd.bnd
+++ b/org.argeo.cms.ui.workbench/bnd.bnd
@@ -13,9 +13,8 @@ org.eclipse.jface.window,\
 org.eclipse.swt,\
 org.eclipse.swt.widgets,\
 org.eclipse.ui.services,\
-org.osgi.framework,\
+org.osgi.*;version=0.0.0,\
 org.springframework.core,\
-org.osgi.util.tracker,\
 org.springframework.beans.factory,\
 org.springframework.core.io.support,\
 !org.eclipse.core.runtime,\
diff --git a/org.argeo.cms.ui/bnd.bnd b/org.argeo.cms.ui/bnd.bnd
index 68a480b61..50ebd7ceb 100644
--- a/org.argeo.cms.ui/bnd.bnd
+++ b/org.argeo.cms.ui/bnd.bnd
@@ -13,6 +13,7 @@ org.eclipse.rap.rwt.client;version="[2.1,4)",\
 org.eclipse.rap.rwt.client.service;version="[2.1,4)",\
 org.eclipse.rap.rwt.service;version="[2.1,4)",\
 org.eclipse.rap.rwt.widgets;version="[2.1,4)",\
+org.osgi.*;version=0.0.0,\
 *
 
 ## TODO: in order to enable single sourcing, we have introduced dummy RAP packages 
diff --git a/org.argeo.cms/bnd.bnd b/org.argeo.cms/bnd.bnd
index f25797109..9d4c3bb50 100644
--- a/org.argeo.cms/bnd.bnd
+++ b/org.argeo.cms/bnd.bnd
@@ -9,5 +9,6 @@ org.eclipse.equinox.http.jetty,\
 org.springframework.context,\
 org.springframework.core.io,\
 org.apache.commons.httpclient.cookie;resolution:=optional,\
+org.osgi.*;version=0.0.0,\
 *
 Provide-Capability: cms.datamodel;name=cms;cnd=/org/argeo/cms/cms.cnd;abstract=true
\ No newline at end of file
diff --git a/org.argeo.enterprise/bnd.bnd b/org.argeo.enterprise/bnd.bnd
index e69de29bb..4b2eb271a 100644
--- a/org.argeo.enterprise/bnd.bnd
+++ b/org.argeo.enterprise/bnd.bnd
@@ -0,0 +1,2 @@
+Import-Package:	org.osgi.*;version=0.0.0,\
+*				
diff --git a/org.argeo.osgi.boot/bnd.bnd b/org.argeo.osgi.boot/bnd.bnd
index 7c2fe0177..9fb5d87be 100644
--- a/org.argeo.osgi.boot/bnd.bnd
+++ b/org.argeo.osgi.boot/bnd.bnd
@@ -1,2 +1,4 @@
 Bundle-Activator: org.argeo.osgi.boot.Activator
-Import-Package: org.eclipse.*;resolution:=optional,*
+Import-Package: org.eclipse.*;resolution:=optional,\
+org.osgi.*;version=0.0.0,\
+*