From 1fd5b54ab03b3aa3fcea7c601819ebd3f3be3f7d Mon Sep 17 00:00:00 2001 From: Mathieu Date: Thu, 3 Nov 2022 11:31:32 +0100 Subject: [PATCH] Make Eclipse E4 optional --- swt/org.argeo.cms.e4/bnd.bnd | 5 +++-- swt/rap/org.argeo.cms.e4.rap/bnd.bnd | 1 + swt/rcp/org.argeo.cms.e4.rcp/bnd.bnd | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/swt/org.argeo.cms.e4/bnd.bnd b/swt/org.argeo.cms.e4/bnd.bnd index 6dcd5a618..2f58e6a7e 100644 --- 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 2ad4b2eef..6db081fc2 100644 --- 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 ff79c8041..eaa51adec 100644 --- 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,\ * -- 2.30.2