From 1087dc5f2255b8befa31e6e0cf98e72d9483ceed Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Tue, 29 Nov 2022 16:09:35 -0500 Subject: [PATCH] [releng] Require target platform bundles as minimum version Without setting dependent plug-ins to minimum version to match the target platform we are aiming for we can imply (and therefore let install) CDT into older versions of Eclipse where CDT does not actually work. This can be exposed in very odd ways, such as IllegalAccessError, when platform has allowed API changes. However, rather than update every single bundle in CDT, only the o.e.cdt.core/ui bundles are being updated as this should achieve the desired result without every other bundle needing to be touched. See Bug 536448 Part of #77 --- .../org.eclipse.cdt.core/META-INF/MANIFEST.MF | 20 +++++----- core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF | 40 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF index fdf999fbdae..c0e55984241 100644 --- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF @@ -122,17 +122,17 @@ Export-Package: org.eclipse.cdt.core, org.eclipse.cdt.utils.som.parser, org.eclipse.cdt.utils.xcoff, org.eclipse.cdt.utils.xcoff.parser -Require-Bundle: org.eclipse.cdt.core.native;bundle-version="[6.2.0,7.0.0)";visibility:=reexport, - org.eclipse.core.contenttype;bundle-version="[3.8.100,4.0.0)", - org.eclipse.core.expressions;bundle-version="[3.8.100,4.0.0)", - org.eclipse.core.filebuffers;bundle-version="[3.7.100,4.0.0)", - org.eclipse.core.filesystem;bundle-version="[1.9.200,2.0.0)", - org.eclipse.core.resources;bundle-version="[3.16.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.24.0,4.0.0)", +Require-Bundle: org.eclipse.cdt.core.native;bundle-version="[6.3.0,7.0.0)";visibility:=reexport, + org.eclipse.core.contenttype;bundle-version="[3.8.200,4.0.0)", + org.eclipse.core.expressions;bundle-version="[3.8.200,4.0.0)", + org.eclipse.core.filebuffers;bundle-version="[3.7.200,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.9.500,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.18.100,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", org.eclipse.core.variables;bundle-version="[3.5.100,4.0.0)", - org.eclipse.ltk.core.refactoring;bundle-version="[3.12.100,4.0.0)", - org.eclipse.osgi.services;bundle-version="[3.10.200,4.0.0)", - org.eclipse.text;bundle-version="[3.12.0,4.0.0)", + org.eclipse.ltk.core.refactoring;bundle-version="[3.13.0,4.0.0)", + org.eclipse.osgi.services;bundle-version="[3.11.100,4.0.0)", + org.eclipse.text;bundle-version="[3.12.300,4.0.0)", com.google.gson;bundle-version="[2.8.6,3.0.0)", org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional Bundle-ActivationPolicy: lazy diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF index 69f93678428..020b63a6836 100644 --- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF @@ -103,29 +103,29 @@ Export-Package: org.eclipse.cdt.internal.corext;x-internal:=true, org.eclipse.cdt.ui.wizards.conversion, org.eclipse.cdt.utils.ui.controls Require-Bundle: org.eclipse.cdt.core;bundle-version="[8.0.0,9.0.0)", - org.eclipse.compare;bundle-version="[3.8.200,4.0.0)", - org.eclipse.core.expressions;bundle-version="[3.8.100,4.0.0)", - org.eclipse.core.filesystem;bundle-version="[1.9.200,2.0.0)", - org.eclipse.core.resources;bundle-version="[3.16.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.24.0,4.0.0)", + org.eclipse.compare;bundle-version="[3.8.500,4.0.0)", + org.eclipse.core.expressions;bundle-version="[3.8.200,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.9.500,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.18.100,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", org.eclipse.core.variables;bundle-version="[3.5.100,4.0.0)", - org.eclipse.e4.core.contexts;bundle-version="[1.9.100,2.0.0)", + org.eclipse.e4.core.contexts;bundle-version="[1.11.0,2.0.0)", org.eclipse.help;bundle-version="[3.9.100,4.0.0)", - org.eclipse.jface.text;bundle-version="[3.19.0,4.0.0)", - org.eclipse.ltk.core.refactoring;bundle-version="[3.12.100,4.0.0)", - org.eclipse.ltk.ui.refactoring;bundle-version="[3.12.0,4.0.0)", - org.eclipse.search;bundle-version="[3.14.0,4.0.0)", - org.eclipse.ui;bundle-version="[3.200.0,4.0.0)", - org.eclipse.ui.console;bundle-version="[3.11.100,4.0.0)", - org.eclipse.ui.editors;bundle-version="[3.14.300,4.0.0)", - org.eclipse.ui.forms;bundle-version="[3.11.300,4.0.0)", - org.eclipse.ui.ide;bundle-version="[3.18.400,4.0.0)", - org.eclipse.ui.navigator;bundle-version="[3.10.200,4.0.0)", - org.eclipse.ui.navigator.resources;bundle-version="[3.8.300,4.0.0)", - org.eclipse.ui.views;bundle-version="[3.11.100,4.0.0)", - org.eclipse.ui.workbench.texteditor;bundle-version="[3.16.300,4.0.0)", + org.eclipse.jface.text;bundle-version="[3.22.0,4.0.0)", + org.eclipse.ltk.core.refactoring;bundle-version="[3.13.0,4.0.0)", + org.eclipse.ltk.ui.refactoring;bundle-version="[3.12.200,4.0.0)", + org.eclipse.search;bundle-version="[3.14.300,4.0.0)", + org.eclipse.ui;bundle-version="[3.201.200,4.0.0)", + org.eclipse.ui.console;bundle-version="[3.11.400,4.0.0)", + org.eclipse.ui.editors;bundle-version="[3.14.400,4.0.0)", + org.eclipse.ui.forms;bundle-version="[3.11.500,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.20.0,4.0.0)", + org.eclipse.ui.navigator;bundle-version="[3.10.400,4.0.0)", + org.eclipse.ui.navigator.resources;bundle-version="[3.8.500,4.0.0)", + org.eclipse.ui.views;bundle-version="[3.11.300,4.0.0)", + org.eclipse.ui.workbench.texteditor;bundle-version="[3.16.600,4.0.0)", org.eclipse.e4.ui.css.swt.theme, - org.eclipse.tools.templates.ui;bundle-version="[1.2.200,2.0.0)" + org.eclipse.tools.templates.ui;bundle-version="[1.4.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.cdt.ui