Make Eclipse E4 optional

diff --git a/swt/org.argeo.cms.e4/bnd.bnd b/swt/org.argeo.cms.e4/bnd.bnd
index 6dcd5a6180ddaa48ef40f4fe016f59207ec4b14f..2f58e6a7e6224707a1e2da89f0fab6444df23758 100644 (file)
--- a/swt/org.argeo.cms.e4/bnd.bnd
+++ b/swt/org.argeo.cms.e4/bnd.bnd
@@ -5,13 +5,14 @@ Import-Package: \
 org.argeo.api.acr,\
 org.eclipse.swt,\
 org.eclipse.swt.widgets;version="0.0.0",\
-org.eclipse.e4.ui.model.application.ui,\
-org.eclipse.e4.ui.model.application,\
+org.eclipse.e4.ui.model.application.ui;resolution:=optional,\
+org.eclipse.e4.ui.model.application;resolution:=optional,\
 org.argeo.cms,\
 org.eclipse.core.commands.common,\
 org.eclipse.jface.window,\
 org.eclipse.jface.dialogs,\
 org.argeo.cms.swt.auth,\
 javax.servlet.*;version="[3,5)",\
+org.eclipse.*;resolution:=optional,\
 *
 

diff --git a/swt/rap/org.argeo.cms.e4.rap/bnd.bnd b/swt/rap/org.argeo.cms.e4.rap/bnd.bnd
index 2ad4b2eef937b661e8f149fb29e71e73579a43ca..6db081fc29107f6b74ca5e2981f3f63dbba180b1 100644 (file)
--- a/swt/rap/org.argeo.cms.e4.rap/bnd.bnd
+++ b/swt/rap/org.argeo.cms.e4.rap/bnd.bnd
@@ -5,4 +5,5 @@ org.eclipse.swt.graphics,\
 org.eclipse.e4.ui.workbench,\
 org.eclipse.rap.rwt.client,\
 org.eclipse.nebula.widgets.richtext;resolution:=optional,\
+org.eclipse.*;resolution:=optional,\
 *

diff --git a/swt/rcp/org.argeo.cms.e4.rcp/bnd.bnd b/swt/rcp/org.argeo.cms.e4.rcp/bnd.bnd
index ff79c8041156aa6010641c0b307ab5fe48c2a62c..eaa51adecead40031e25913a3356a96061456aa6 100644 (file)
--- a/swt/rcp/org.argeo.cms.e4.rcp/bnd.bnd
+++ b/swt/rcp/org.argeo.cms.e4.rcp/bnd.bnd
@@ -4,4 +4,5 @@ Require-Bundle: org.eclipse.core.runtime
 
 Import-Package: !org.eclipse.core.runtime,\
 org.eclipse.swt,\
+org.eclipse.*;resolution:=optional,\
 *