From 078f8e26af99d76a7b2cb517771984dc3f92f896 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sat, 29 Apr 2023 18:21:36 +0200 Subject: [PATCH] Clean-up OSGi package imports and remove unused dependencies - Use properly closed version range - Remove unused packages - Mark optional package-imports that are definitely not optional as such - Replace requirements to org.eclipse.osgi by corresponding package-imports for the general osgi packages - Remove unused dependencies --- .../META-INF/MANIFEST.MF | 3 --- .../META-INF/MANIFEST.MF | 6 +++--- .../META-INF/MANIFEST.MF | 3 +-- .../META-INF/MANIFEST.MF | 4 +--- .../META-INF/MANIFEST.MF | 7 ++----- .../org.eclipse.e4.ui.di/META-INF/MANIFEST.MF | 3 +-- .../META-INF/MANIFEST.MF | 8 +------- .../META-INF/MANIFEST.MF | 5 ++--- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 6 ++---- .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 6 +----- .../META-INF/MANIFEST.MF | 7 +++---- .../META-INF/MANIFEST.MF | 8 ++------ bundles/org.eclipse.jface/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 8 +------- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 6 ++---- .../META-INF/MANIFEST.MF | 9 ++------- .../META-INF/MANIFEST.MF | 13 ++++--------- .../META-INF/MANIFEST.MF | 6 ------ tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF | 8 -------- .../META-INF/MANIFEST.MF | 17 ++++------------- .../META-INF/MANIFEST.MF | 5 +++-- .../org.eclipse.e4.tools/META-INF/MANIFEST.MF | 3 --- 25 files changed, 39 insertions(+), 109 deletions(-) diff --git a/bundles/org.eclipse.core.databinding.observable/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.databinding.observable/META-INF/MANIFEST.MF index 7abf7bc6bd8..cac643ee105 100644 --- a/bundles/org.eclipse.core.databinding.observable/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.core.databinding.observable/META-INF/MANIFEST.MF @@ -19,8 +19,5 @@ Export-Package: org.eclipse.core.databinding.observable, org.eclipse.core.internal.databinding.observable.masterdetail;x-friends:="org.eclipse.jface.tests.databinding", org.eclipse.core.internal.databinding.observable.sideeffect;x-friends:="org.eclipse.jface.databinding" Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.8.0,4.0.0)" -Import-Package: org.osgi.framework;version="[1.4.0,2.0.0)";resolution:=optional, - org.osgi.util.tracker;version="[1.3.3,2.0.0)";resolution:=optional, - org.eclipse.osgi.framework.log;version="[1.0.0,2.0.0)";resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.core.databinding.observable diff --git a/bundles/org.eclipse.core.databinding/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.databinding/META-INF/MANIFEST.MF index 9b21f027190..f286f875479 100644 --- a/bundles/org.eclipse.core.databinding/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.core.databinding/META-INF/MANIFEST.MF @@ -18,9 +18,9 @@ Export-Package: org.eclipse.core.databinding, Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)";visibility:=reexport, org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)" -Import-Package: org.eclipse.osgi.framework.log;version="[1.0.0,2.0.0)";resolution:=optional, - org.osgi.framework;version="[1.4.0,2.0.0)";resolution:=optional, - org.osgi.util.tracker;version="[1.3.3,2.0.0)";resolution:=optional +Import-Package: org.eclipse.osgi.framework.log;version="[1.0.0,2.0.0)", + org.osgi.framework;version="[1.4.0,2.0.0)", + org.osgi.util.tracker;version="[1.3.3,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: org.eclipse.core.internal.databinding.Activator Bundle-ActivationPolicy: lazy diff --git a/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF index 8abbacce687..57c45c5c276 100644 --- a/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.core.commands/META-INF/MANIFEST.MF @@ -12,8 +12,7 @@ Import-Package: javax.annotation, org.eclipse.core.commands.common, org.eclipse.core.expressions, org.eclipse.e4.core.contexts, - org.eclipse.e4.core.services.log, - org.osgi.framework;version="1.5.0" + org.eclipse.e4.core.services.log Export-Package: org.eclipse.e4.core.commands, org.eclipse.e4.core.commands.internal;x-friends:="org.eclipse.e4.ui.bindings,org.eclipse.ui.workbench" Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.6.0,4.0.0)", diff --git a/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF index 3cfd6d17281..8619fd1658d 100644 --- a/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF @@ -14,10 +14,8 @@ Import-Package: javax.annotation, org.eclipse.e4.core.services.log, org.eclipse.jface.bindings, org.eclipse.jface.bindings.keys, - org.eclipse.jface.bindings.keys.formatting, org.eclipse.jface.dialogs, - org.eclipse.jface.window, - org.osgi.framework;version="1.5.0" + org.eclipse.jface.window Require-Bundle: org.eclipse.swt;bundle-version="[3.6.0,4.0.0)", org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)", org.eclipse.e4.core.contexts;bundle-version="1.0.0", diff --git a/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF index ae44b0c95ce..263d998e3e9 100644 --- a/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF @@ -9,18 +9,15 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.swt;bundle-version="[3.6.0,4.0.0)", org.eclipse.e4.ui.css.swt;bundle-version="0.13.100", org.eclipse.e4.ui.css.core;bundle-version="0.12.200", - org.eclipse.equinox.common;bundle-version="[3.6.0,4.0.0)", org.w3c.css.sac;bundle-version="1.3.0", - org.eclipse.equinox.registry;bundle-version="[3.5.0,4.0.0)", - org.eclipse.equinox.preferences;bundle-version="[3.3.0,4.0.0)", org.eclipse.core.runtime;bundle-version="3.8.0" Service-Component: OSGI-INF/org.eclipse.e4.ui.css.swt.internal.theme.ThemeEngineManager.xml Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.e4.ui.css.swt.internal.theme;x-internal:=true, org.eclipse.e4.ui.css.swt.theme;x-friends:="org.eclipse.e4.ui.workbench.renderers.swt,org.eclipse.e4.ui.workbench.swt,org.eclipse.ui.workbench" Import-Package: org.eclipse.osgi.service.datalocation;version="1.3.0", - org.osgi.framework;version="1.5.0", - org.osgi.service.event;version="1.3.0";resolution:=optional + org.osgi.framework;version="[1.5.0,2.0.0)", + org.osgi.service.event;version="[1.3.0,2.0.0)" Require-Capability: osgi.extender; filter:="(&(osgi.extender=osgi.component)(version>=1.2)(!(version>=2.0)))" Automatic-Module-Name: org.eclipse.e4.ui.css.swt.theme diff --git a/bundles/org.eclipse.e4.ui.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.di/META-INF/MANIFEST.MF index 3716ef8f167..134f19c89c7 100644 --- a/bundles/org.eclipse.e4.ui.di/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.di/META-INF/MANIFEST.MF @@ -12,8 +12,7 @@ Import-Package: javax.inject;version="1.0.0", org.eclipse.e4.core.di.annotations;version="0.15.0", org.eclipse.e4.core.di.internal.extensions;version="0.15.0", org.eclipse.e4.core.di.suppliers, - org.osgi.framework;version="1.8.0", - org.osgi.service.event;version="1.3.0" + org.osgi.service.event;version="[1.3.0,2.0.0)" Export-Package: org.eclipse.e4.ui.di, org.eclipse.e4.ui.internal.di;x-internal:=true Service-Component: OSGI-INF/org.eclipse.e4.ui.internal.di.UIEventObjectSupplier.xml diff --git a/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF index ac140ce7567..e81f1332432 100644 --- a/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF @@ -5,13 +5,9 @@ Bundle-Version: 0.4.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.jobs;bundle-version="3.5.400", - org.eclipse.equinox.common;bundle-version="3.6.200", - org.eclipse.osgi;bundle-version="3.10.0", - org.eclipse.e4.core.di;bundle-version="1.3.0", +Require-Bundle: org.eclipse.e4.core.di;bundle-version="1.3.0", org.eclipse.e4.ui.di;bundle-version="1.0.0", org.eclipse.jface;bundle-version="3.10.0", - org.eclipse.core.jobs;bundle-version="3.13.0", org.eclipse.e4.ui.workbench, org.eclipse.e4.core.commands, org.eclipse.e4.core.services, @@ -19,8 +15,6 @@ Require-Bundle: org.eclipse.core.jobs;bundle-version="3.5.400", org.eclipse.e4.ui.model.workbench, org.eclipse.e4.ui.workbench.swt, org.eclipse.core.runtime;bundle-version="3.10.0", - org.eclipse.swt, - org.eclipse.e4.core.di.extensions;bundle-version="0.12.0", org.eclipse.e4.ui.services Import-Package: javax.annotation, javax.inject;version="1.0.0" diff --git a/bundles/org.eclipse.e4.ui.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.services/META-INF/MANIFEST.MF index 82684417b1e..827bb83cdf2 100644 --- a/bundles/org.eclipse.e4.ui.services/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.services/META-INF/MANIFEST.MF @@ -9,9 +9,8 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: javax.annotation, javax.inject;version="1.0.0", - org.osgi.framework;version="1.3.0", - org.osgi.service.event;resolution:=optional, - org.osgi.util.tracker;version="1.5.1" + org.osgi.framework;version="[1.3.0,2.0.0)", + org.osgi.service.event;version="[1.4.0,2.0.0)" Require-Bundle: org.eclipse.core.commands;bundle-version="[3.4.0,4.0.0)", org.eclipse.e4.core.services;bundle-version="0.9.0", org.eclipse.e4.core.contexts;bundle-version="0.9.0", diff --git a/bundles/org.eclipse.e4.ui.swt.win32/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.swt.win32/META-INF/MANIFEST.MF index e8c5421c731..9f3135bcc8d 100644 --- a/bundles/org.eclipse.e4.ui.swt.win32/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.swt.win32/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Eclipse-PlatformFilter: (osgi.ws=win32) Import-Package: javax.annotation, javax.inject, org.eclipse.e4.core.services.events, - org.osgi.service.event;version="1.3.1" + org.osgi.service.event;version="[1.3.0,2.0.0)" Automatic-Module-Name: org.eclipse.e4.ui.swt.win32 diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF index 69e6e875df1..e313a84897a 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF @@ -12,8 +12,6 @@ Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="1.0.0", org.eclipse.e4.core.services;bundle-version="0.9.1", org.eclipse.e4.ui.workbench.renderers.swt;bundle-version="0.9.1", org.eclipse.e4.ui.widgets;bundle-version="0.11.0", - org.eclipse.e4.ui.css.swt;bundle-version="0.9.1", - org.eclipse.e4.ui.css.core;bundle-version="0.9.0", org.eclipse.swt;bundle-version="[3.7.0,4.0.0)", org.eclipse.jface;bundle-version="[3.7.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", @@ -25,8 +23,8 @@ Bundle-ActivationPolicy: lazy Import-Package: javax.annotation, javax.inject;version="1.0.0", org.eclipse.e4.ui.internal.workbench.swt, - org.eclipse.osgi.util;version="1.1.0", - org.osgi.service.event;version="1.3.0" + org.eclipse.osgi.util;version="[1.1.0,2.0.0)", + org.osgi.service.event;version="[1.3.0,2.0.0)" Export-Package: org.eclipse.e4.ui.workbench.addons.cleanupaddon;x-internal:=true, org.eclipse.e4.ui.workbench.addons.dndaddon;x-internal:=true, org.eclipse.e4.ui.workbench.addons.minmax;x-internal:=true, diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt.cocoa/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.renderers.swt.cocoa/META-INF/MANIFEST.MF index 19034313bb9..6564dd56613 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt.cocoa/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt.cocoa/META-INF/MANIFEST.MF @@ -6,6 +6,7 @@ Bundle-Version: 0.14.0.qualifier Bundle-Name: %fragmentName Bundle-Vendor: %providerName Fragment-Host: org.eclipse.e4.ui.workbench.renderers.swt;bundle-version="[0.10.0,1.0.0)" +Require-Bundle: org.eclipse.e4.ui.css.swt.theme Bundle-Localization: fragment-cocoa Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.e4.ui.workbench.renderers.swt.cocoa;x-internal:=true diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF index 9e073ab8d64..f8b2c955293 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF @@ -17,21 +17,17 @@ Require-Bundle: org.eclipse.e4.ui.workbench;bundle-version="0.9.0", org.eclipse.e4.ui.model.workbench;bundle-version="0.9.0", org.eclipse.e4.core.commands;bundle-version="0.9.0", org.eclipse.e4.ui.bindings;bundle-version="0.9.0", - org.eclipse.equinox.common;bundle-version="[3.6.0,4.0.0)", org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", - org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0", org.eclipse.e4.ui.css.core;bundle-version="0.9.0", - org.eclipse.osgi;bundle-version="[3.6.0,4.0.0)", org.eclipse.e4.ui.di;bundle-version="0.9.0", org.eclipse.emf.ecore;bundle-version="2.7.0", org.eclipse.e4.ui.css.swt;bundle-version="0.11.0", org.eclipse.e4.core.di.extensions;bundle-version="0.12.0", - org.eclipse.equinox.preferences;bundle-version="3.5.200", org.eclipse.core.runtime;bundle-version="3.17.100" Export-Package: org.eclipse.e4.ui.internal.workbench.renderers.swt;x-friends:="org.eclipse.ui.workbench", org.eclipse.e4.ui.workbench.renderers.swt;x-friends:="org.eclipse.e4.ui.workbench.addons.swt,org.eclipse.ui.workbench" Bundle-ActivationPolicy: lazy Import-Package: javax.annotation, javax.inject;version="1.0.0", - org.osgi.service.event;version="1.3.0" + org.osgi.service.event;version="[1.3.0,2.0.0)" Automatic-Module-Name: org.eclipse.e4.ui.workbench.renderers.swt diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF index f5249f61433..918603fd243 100644 --- a/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF @@ -42,10 +42,9 @@ Import-Package: javax.annotation, javax.inject;version="1.0.0", org.eclipse.osgi.service.datalocation;version="1.2.0", org.eclipse.osgi.service.debug;version="1.1.0", - org.osgi.framework;version="1.5.0", - org.osgi.service.event;version="1.3.0", - org.osgi.service.packageadmin;version="1.2.0", - org.osgi.util.tracker;version="1.4.0" + org.osgi.framework;version="[1.5.0,2.0.0)", + org.osgi.service.event;version="[1.3.0,2.0.0)", + org.osgi.util.tracker;version="[1.4.0,2.0.0)" Service-Component: OSGI-INF/org.eclipse.e4.ui.internal.workbench.swt.MenuServiceCreationFunction.xml, OSGI-INF/org.eclipse.e4.ui.internal.workbench.swt.StatusReporterCreationFunction.xml, OSGI-INF/org.eclipse.e4.ui.internal.workbench.swt.E4Testable.xml, diff --git a/bundles/org.eclipse.e4.ui.workbench/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench/META-INF/MANIFEST.MF index fcea21696db..e605e0863b1 100644 --- a/bundles/org.eclipse.e4.ui.workbench/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.workbench/META-INF/MANIFEST.MF @@ -6,13 +6,10 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0", - org.eclipse.equinox.common;bundle-version="[3.7.0,4.0.0)", org.eclipse.e4.ui.services;bundle-version="0.9.0", - org.eclipse.equinox.registry;bundle-version="[3.4.0,4.0.0)", org.eclipse.e4.core.services;bundle-version="0.9.0", org.eclipse.e4.core.contexts;bundle-version="1.0.0", org.eclipse.e4.core.di;bundle-version="1.1.0", - org.eclipse.core.jobs;bundle-version="[3.4.0,4.0.0)", org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)", org.eclipse.e4.core.commands;bundle-version="0.11.100", org.eclipse.emf.ecore.change;bundle-version="2.5.0", @@ -20,8 +17,7 @@ Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0", org.eclipse.e4.ui.di;bundle-version="0.9.0", org.eclipse.emf.ecore.xmi;bundle-version="2.7.0", org.eclipse.e4.core.di.extensions, - org.eclipse.core.runtime;bundle-version="3.3.0", - org.eclipse.jdt.annotation;bundle-version="2.2.200";resolution:=optional + org.eclipse.core.runtime;bundle-version="3.3.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.e4.ui.internal.workbench; @@ -45,7 +41,7 @@ Service-Component: OSGI-INF/org.eclipse.e4.ui.internal.LocaleChangeServiceContex OSGI-INF/org.eclipse.e4.ui.internal.workbench.ProgressMonitorFunction.xml Import-Package: javax.annotation, javax.inject;version="1.0.0", - org.osgi.service.event;version="1.3.0" + org.osgi.service.event;version="[1.3.0,2.0.0)" Require-Capability: osgi.extender; filter:="(&(osgi.extender=osgi.component)(version>=1.2)(!(version>=2.0)))", osgi.service; diff --git a/bundles/org.eclipse.jface/META-INF/MANIFEST.MF b/bundles/org.eclipse.jface/META-INF/MANIFEST.MF index ec12fa49591..7ef5de5eab1 100644 --- a/bundles/org.eclipse.jface/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.jface/META-INF/MANIFEST.MF @@ -40,7 +40,7 @@ Require-Bundle: org.eclipse.swt;bundle-version="[3.111.0,4.0.0)";visibility:=ree org.eclipse.equinox.bidi;bundle-version="[0.10.0,2.0.0)";resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: javax.xml.parsers, - org.osgi.framework, + org.osgi.framework;version="[1.8.0,2.0.0)", org.w3c.dom, org.xml.sax Automatic-Module-Name: org.eclipse.jface diff --git a/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF index b9e6a2bd447..ba899188e3b 100644 --- a/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF @@ -97,12 +97,9 @@ Export-Package: org.eclipse.e4.ui.workbench.addons.perspectiveswitcher;x-interna Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.0,4.0.0)", org.eclipse.help;bundle-version="[3.2.0,4.0.0)", org.eclipse.jface;bundle-version="[3.18.0,4.0.0)", - org.eclipse.swt;bundle-version="[3.107.0,4.0.0)", org.eclipse.jface.databinding;bundle-version="[1.3.0,2.0.0)", org.eclipse.core.databinding.property;bundle-version="[1.2.0,2.0.0)", org.eclipse.core.databinding.observable;bundle-version="[1.2.0,2.0.0)", - org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", - org.eclipse.core.jobs;bundle-version="[3.13.0,4.0.0)", org.eclipse.e4.core.services;bundle-version="2.2.0", org.eclipse.e4.core.contexts;bundle-version="1.0.0", org.eclipse.e4.core.di;bundle-version="1.1.0", @@ -112,10 +109,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.0,4.0.0)", org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0", org.eclipse.e4.ui.bindings;bundle-version="0.9.0", org.eclipse.e4.ui.css.swt;bundle-version="0.9.1", - org.eclipse.e4.ui.css.core;bundle-version="0.9.0", org.eclipse.e4.ui.workbench3;bundle-version="0.15.0";visibility:=reexport, org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.10.0", - org.eclipse.emf.ecore;bundle-version="2.7.0", org.eclipse.e4.ui.services;bundle-version="1.3.0", org.eclipse.emf.ecore.xmi;bundle-version="2.11.0", org.eclipse.e4.core.di.extensions;bundle-version="0.13.0" @@ -133,9 +128,8 @@ Import-Package: com.ibm.icu.util, org.eclipse.e4.ui.workbench, org.eclipse.e4.ui.workbench.modeling, org.eclipse.e4.ui.workbench.renderers.swt, - org.osgi.service.event;version="1.2.0", + org.osgi.service.event;version="[1.2.0,2.0.0)", org.w3c.dom, - org.w3c.dom.css, org.xml.sax Bundle-RequiredExecutionEnvironment: JavaSE-17 Service-Component: OSGI-INF/org.eclipse.ui.internal.themes.ColorAndFontProviderImpl.xml diff --git a/examples/org.eclipse.ui.examples.adapterservice/META-INF/MANIFEST.MF b/examples/org.eclipse.ui.examples.adapterservice/META-INF/MANIFEST.MF index 802f0659da6..9ab1b26c38a 100644 --- a/examples/org.eclipse.ui.examples.adapterservice/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.ui.examples.adapterservice/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Vendor: Eclipse.org Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: org.eclipse.ui.examples.adapterservice.snippets.SnippetActivator Import-Package: javax.inject;version="1.0.0", - org.osgi.framework;version="1.5.0" + org.osgi.framework;version="[1.5.0,2.0.0)" Require-Bundle: org.eclipse.equinox.app, org.eclipse.equinox.common;bundle-version="3.4.0", org.eclipse.core.runtime;bundle-version="3.4.0", diff --git a/tests/org.eclipse.e4.core.commands.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.core.commands.tests/META-INF/MANIFEST.MF index c0fbaa9109f..9aca927a722 100644 --- a/tests/org.eclipse.e4.core.commands.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.e4.core.commands.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.e4.core.commands.tests;singleton:=true -Bundle-Version: 0.14.0.qualifier +Bundle-Version: 0.14.100.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.commands, org.eclipse.e4.core.commands, @@ -11,9 +11,7 @@ Require-Bundle: org.eclipse.core.commands, org.eclipse.e4.core.di Import-Package: javax.inject;version="1.0.0", org.eclipse.e4.core.contexts, - org.osgi.framework;version="1.5.0", - org.osgi.service.log;version="1.3.0", - org.osgi.service.packageadmin;version="1.2.0" + org.osgi.framework;version="[1.5.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Eclipse-BundleShape: dir diff --git a/tests/org.eclipse.e4.ui.bindings.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.ui.bindings.tests/META-INF/MANIFEST.MF index 18de555867a..43b66ce0839 100644 --- a/tests/org.eclipse.e4.ui.bindings.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.e4.ui.bindings.tests/META-INF/MANIFEST.MF @@ -4,16 +4,11 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.e4.ui.bindings.tests Bundle-Version: 0.14.100.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: javax.inject;version="1.0.0", - org.eclipse.e4.core.commands, - org.eclipse.e4.ui.internal.services, +Import-Package: org.eclipse.e4.core.commands, org.eclipse.e4.ui.services, org.eclipse.jface.bindings, org.eclipse.jface.bindings.keys, - org.eclipse.jface.bindings.keys.formatting, - org.osgi.framework;version="1.5.0", - org.osgi.service.log;version="1.3.0", - org.osgi.service.packageadmin;version="1.2.0" + org.osgi.framework;version="1.5.0" Require-Bundle: org.eclipse.core.commands;bundle-version="3.5.0", org.junit, org.eclipse.e4.ui.bindings;bundle-version="0.9.0", diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF index 82590b3c472..a02874cd4fe 100644 --- a/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF @@ -2,17 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.e4.ui.tests.css.swt; singleton:=true -Bundle-Version: 0.12.0.qualifier -Require-Bundle: org.eclipse.swt, - org.eclipse.e4.ui.css.core, +Bundle-Version: 0.12.100.qualifier +Require-Bundle: org.eclipse.e4.ui.css.core, org.eclipse.e4.ui.css.swt, org.w3c.css.sac, org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.1", - org.eclipse.ui;bundle-version="3.106.0", org.mockito.mockito-core;bundle-version="2.13.0", - net.bytebuddy.byte-buddy, org.eclipse.equinox.preferences;bundle-version="3.5.200", - org.eclipse.ui.forms, org.eclipse.ui.views.properties.tabbed Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -20,9 +16,8 @@ Import-Package: org.eclipse.core.runtime;version="3.5.0", org.junit.jupiter.api;version="5.9.1", org.junit.jupiter.api.function, org.junit.platform.suite.api;version="1.9.1", - org.osgi.framework;version="1.7.0";resolution:=optional, - org.osgi.service.event;version="1.3.0";resolution:=optional, - org.osgi.util.tracker;version="1.5.3" + org.osgi.framework;version="[1.7.0,2.0.0)", + org.osgi.service.event;version="[1.3.0,2.0.0)" Eclipse-BundleShape: dir Automatic-Module-Name: org.eclipse.e4.ui.tests.css.swt Bundle-Vendor: %Bundle-Vendor diff --git a/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF index dfb31c0608b..ac6aef201ae 100644 --- a/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF @@ -8,12 +8,8 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.4.0", org.eclipse.jface;bundle-version="3.4.0", - org.eclipse.equinox.common;bundle-version="3.4.0", - org.eclipse.osgi;bundle-version="3.4.0", org.eclipse.e4.ui.services;bundle-version="0.9.0", - org.eclipse.equinox.registry;bundle-version="3.4.0", org.eclipse.core.runtime;bundle-version="3.4.0", - org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.core.databinding;bundle-version="1.2.0", org.eclipse.jface.databinding;bundle-version="1.3.0", org.eclipse.e4.core.services;bundle-version="0.9.0", @@ -30,11 +26,9 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.4.0", org.eclipse.e4.ui.di;bundle-version="0.9.0", org.eclipse.e4.core.di.extensions;bundle-version="0.15.0", org.eclipse.e4.core.di.extensions.supplier;bundle-version="0.15.0", - org.eclipse.core.expressions;bundle-version="3.4.200", org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.9.0", org.eclipse.e4.ui.css.swt;bundle-version="0.11.0", org.mockito.mockito-core;bundle-version="2.13.0", - net.bytebuddy.byte-buddy, org.eclipse.e4.ui.css.core;bundle-version="0.10.100", org.eclipse.test.performance;bundle-version="3.13.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF index 31847db690e..07cbe26fbd5 100644 --- a/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF @@ -14,10 +14,8 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.14.0", org.eclipse.ui.editors, org.eclipse.ui.workbench.texteditor, org.eclipse.ui.views, - org.eclipse.text, org.eclipse.jface.text, org.eclipse.jface.tests, - org.eclipse.test.performance, org.eclipse.core.tests.harness;bundle-version="3.12.0", org.eclipse.ui.tests.harness, org.eclipse.core.filesystem, @@ -35,18 +33,12 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.14.0", org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0", org.eclipse.e4.ui.bindings;bundle-version="0.9.0", org.eclipse.e4.ui.css.swt;bundle-version="0.9.1", - org.eclipse.e4.ui.css.core;bundle-version="0.9.0", org.eclipse.e4.ui.model.workbench;bundle-version="0.10.0", org.eclipse.e4.ui.workbench;bundle-version="0.10.1", org.eclipse.e4.core.commands;bundle-version="0.10.0", - org.eclipse.e4.core.di.extensions;bundle-version="0.10.0", org.eclipse.e4.ui.services;bundle-version="0.10.0", - org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.10.0", org.eclipse.e4.ui.workbench.renderers.swt;bundle-version="0.10.0", - org.hamcrest.core;bundle-version="1.3.0", org.mockito.mockito-core;bundle-version="2.13.0", - net.bytebuddy.byte-buddy, - org.eclipse.jface;bundle-version="[3.18.0,4.0.0)", org.eclipse.ui.views.log;bundle-version="1.2.1300", org.eclipse.jdt.ui Import-Package: javax.annotation, diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF index 0f0eebf1336..3e3fa0cd08e 100644 --- a/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF +++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF @@ -8,33 +8,24 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0", - org.eclipse.core.databinding;bundle-version="1.3.0", org.eclipse.core.databinding.property;bundle-version="1.2.100", org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1", - org.eclipse.emf.databinding;bundle-version="1.2.0", org.eclipse.jface.databinding;bundle-version="1.4.0", org.eclipse.jface;bundle-version="3.14.0", - org.eclipse.emf.edit;bundle-version="2.6.0", - org.eclipse.equinox.common;bundle-version="3.6.0", org.eclipse.emf.databinding.edit;bundle-version="1.2.0", org.eclipse.core.resources;bundle-version="3.6.0", org.eclipse.e4.core.services;bundle-version="0.9.1", - org.eclipse.osgi;bundle-version="3.6.0", - org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0", org.eclipse.e4.core.di;bundle-version="0.9.0", org.eclipse.e4.ui.workbench;bundle-version="0.9.1", org.eclipse.e4.ui.services;bundle-version="0.9.1", - org.eclipse.equinox.registry;bundle-version="3.5.0", org.eclipse.e4.core.contexts;bundle-version="0.9.0", org.eclipse.e4.ui.di;bundle-version="0.9.0", org.eclipse.e4.tools.services;bundle-version="0.11.0", org.eclipse.e4.core.di.extensions;bundle-version="0.9.0", org.eclipse.jface.text;bundle-version="3.7.0", - org.eclipse.e4.ui.widgets;bundle-version="0.11.0", - org.eclipse.equinox.preferences;bundle-version="3.4.0", org.eclipse.emf.ecore.xmi;bundle-version="2.9.0", - org.eclipse.jdt.core;resolution:=optional, - org.eclipse.pde.core;resolution:=optional, + org.eclipse.jdt.core, + org.eclipse.pde.core, org.eclipse.e4.core.commands;bundle-version="0.10.0", org.eclipse.e4.ui.dialogs;bundle-version="1.0.0", org.eclipse.e4.emf.xpath, @@ -42,8 +33,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0", Bundle-ActivationPolicy: lazy Import-Package: javax.annotation;version="1.2.0", javax.inject;version="1.0.0", - org.osgi.framework;version="1.5.0", - org.osgi.service.event;version="1.3.1" + org.osgi.framework;version="[1.5.0,2.0.0)", + org.osgi.service.event;version="[1.3.0,2.0.0)" Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.model.spy", org.eclipse.e4.tools.emf.ui.common.component;version="0.12.0.qualifier";x-internal:=true, org.eclipse.e4.tools.emf.ui.internal;version="0.12.0.qualifier";x-internal:=true, diff --git a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF index f23c77b3db6..3f7eb0aa30c 100644 --- a/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF +++ b/tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF @@ -10,10 +10,11 @@ Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.swt;bundle-version="3.7.0", org.eclipse.equinox.common;bundle-version="3.6.0", org.eclipse.e4.core.contexts;bundle-version="0.9.0", - org.eclipse.osgi;bundle-version="3.7.0", org.eclipse.e4.core.di;bundle-version="0.9.0" Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml Bundle-ActivationPolicy: lazy Import-Package: javax.annotation;version="1.2.0", - javax.inject;version="1.0.0" + javax.inject;version="1.0.0", + org.eclipse.osgi.util;version="[1.1.0,2.0.0)", + org.osgi.framework;version="[1.10.0,2.0.0)" Automatic-Module-Name: org.eclipse.e4.tools.services diff --git a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF index 1055668dc14..dd0396267d4 100644 --- a/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF +++ b/tools/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF @@ -9,16 +9,13 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0", org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1", org.eclipse.core.resources;bundle-version="3.6.0", org.eclipse.jdt.core;bundle-version="3.6.0", - org.eclipse.jdt.launching;bundle-version="3.5.100", org.eclipse.ui.ide;bundle-version="3.6.0", org.eclipse.core.databinding;bundle-version="1.3.100", org.eclipse.core.databinding.beans;bundle-version="1.2.100", org.eclipse.jface.databinding;bundle-version="1.4.0", org.eclipse.core.databinding.property;bundle-version="1.3.0", org.eclipse.jdt.ui;bundle-version="3.6.0", - org.eclipse.emf.ecore;bundle-version="2.9.0", org.eclipse.emf.ecore.xmi;bundle-version="2.9.0", - org.eclipse.pde.core;bundle-version="3.9.0", org.eclipse.pde.ui;bundle-version="3.8.0" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.e4.internal.tools.ToolsPlugin