From 8a9012a3699e0e704434a4db61dc62906ec5bd1b Mon Sep 17 00:00:00 2001 From: Phillipus Date: Mon, 7 Aug 2023 14:05:16 +0100 Subject: [PATCH] [GEF] Set explicit bundle version number dependencies - If an Archi plug-in has a dependency on these it should compile against our version and not the version from the Eclipse p2 repository --- com.archimatetool.editor/META-INF/MANIFEST.MF | 2 +- com.archimatetool.zest/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.gef/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.zest.core/META-INF/MANIFEST.MF | 4 +++- org.eclipse.zest.layouts/META-INF/MANIFEST.MF | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/com.archimatetool.editor/META-INF/MANIFEST.MF b/com.archimatetool.editor/META-INF/MANIFEST.MF index b6bef42d0..e424c3708 100644 --- a/com.archimatetool.editor/META-INF/MANIFEST.MF +++ b/com.archimatetool.editor/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Vendor: Archi Bundle-Localization: plugin Eclipse-BundleShape: dir Require-Bundle: org.eclipse.core.runtime, - org.eclipse.gef;visibility:=reexport, + org.eclipse.gef;bundle-version="[3.11.100,3.12.0)";visibility:=reexport, org.eclipse.help.ui, org.eclipse.ui, org.eclipse.ui.browser, diff --git a/com.archimatetool.zest/META-INF/MANIFEST.MF b/com.archimatetool.zest/META-INF/MANIFEST.MF index 44a87a9bc..9eacdf98f 100644 --- a/com.archimatetool.zest/META-INF/MANIFEST.MF +++ b/com.archimatetool.zest/META-INF/MANIFEST.MF @@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui, org.eclipse.help.ui, com.archimatetool.editor, - org.eclipse.zest.core, - org.eclipse.zest.layouts + org.eclipse.zest.core;bundle-version="[1.5.400,1.6.0)", + org.eclipse.zest.layouts;bundle-version="[1.1.400,1.2.0)" Bundle-Activator: com.archimatetool.zest.ArchiZestPlugin Export-Package: com.archimatetool.zest Automatic-Module-Name: com.archimatetool.zest diff --git a/org.eclipse.gef/META-INF/MANIFEST.MF b/org.eclipse.gef/META-INF/MANIFEST.MF index e6dd8f712..59f8c8654 100644 --- a/org.eclipse.gef/META-INF/MANIFEST.MF +++ b/org.eclipse.gef/META-INF/MANIFEST.MF @@ -35,9 +35,9 @@ Export-Package: org.eclipse.gef, org.eclipse.gef.ui.stackview.icons, org.eclipse.gef.ui.views.palette, org.eclipse.gef.util -Require-Bundle: org.eclipse.draw2d;visibility:=reexport;bundle-version="[3.7.0,4.0.0)", +Require-Bundle: org.eclipse.draw2d;bundle-version="[3.10.200,3.11.0)";visibility:=reexport, org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", - org.eclipse.ui.views;resolution:=optional;bundle-version="[3.2.0,4.0.0)", + org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)";resolution:=optional, org.eclipse.ui.workbench;bundle-version="[3.2.0,4.0.0)", org.eclipse.jface;bundle-version="[3.2.0,4.0.0)" Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.zest.core/META-INF/MANIFEST.MF b/org.eclipse.zest.core/META-INF/MANIFEST.MF index 90a778409..1fc35e0e8 100644 --- a/org.eclipse.zest.core/META-INF/MANIFEST.MF +++ b/org.eclipse.zest.core/META-INF/MANIFEST.MF @@ -1,7 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.zest.core;singleton:=true -Require-Bundle: org.eclipse.zest.layouts,org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.draw2d;visibility:=reexport +Require-Bundle: org.eclipse.zest.layouts;bundle-version="[1.1.400,1.2.0)", + org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", + org.eclipse.draw2d;bundle-version="[3.10.200,3.11.0)";visibility:=reexport Bundle-Vendor: %Plugin.providerName Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.zest.core.viewers, diff --git a/org.eclipse.zest.layouts/META-INF/MANIFEST.MF b/org.eclipse.zest.layouts/META-INF/MANIFEST.MF index 2f53b61e0..32544e0ba 100644 --- a/org.eclipse.zest.layouts/META-INF/MANIFEST.MF +++ b/org.eclipse.zest.layouts/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Export-Package: org.eclipse.zest.layouts, Require-Bundle: org.eclipse.swt;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)";visibility:=reexport, org.eclipse.jface;bundle-version="[3.2.0,4.0.0)", - org.eclipse.draw2d + org.eclipse.draw2d;bundle-version="[3.10.200,3.11.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.zest.layouts Bundle-ActivationPolicy: lazy