From a1febf009712cf7190b75519e8d610206e540009 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Fri, 31 May 2019 16:53:15 -0400 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 Change-Id: Ifad2e0eef003b037ac332301120c26fe079a2e7f --- .../org.eclipse.cdt.core/META-INF/MANIFEST.MF | 20 ++++----- core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF | 42 +++++++++---------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF index dc9f1a468d0..dd68713e2c6 100644 --- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF @@ -118,16 +118,16 @@ 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="[5.10.1,6.0.0)";visibility:=reexport, - org.eclipse.core.contenttype;bundle-version="[3.7.300,4.0.0)", - org.eclipse.core.expressions;bundle-version="[3.6.400,4.0.0)", - org.eclipse.core.filebuffers;bundle-version="[3.6.600,4.0.0)", - org.eclipse.core.filesystem;bundle-version="[1.7.400,2.0.0)", - org.eclipse.core.resources;bundle-version="[3.13.400,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.15.300,4.0.0)", - org.eclipse.core.variables;bundle-version="[3.4.500,4.0.0)", - org.eclipse.ltk.core.refactoring;bundle-version="[3.10.100,4.0.0)", - org.eclipse.text;bundle-version="[3.8.200,4.0.0)", +Require-Bundle: org.eclipse.cdt.core.native;bundle-version="[5.10.100,6.0.0)";visibility:=reexport, + org.eclipse.core.contenttype;bundle-version="[3.7.400,4.0.0)", + org.eclipse.core.expressions;bundle-version="[3.6.500,4.0.0)", + org.eclipse.core.filebuffers;bundle-version="[3.6.700,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.7.500,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.13.500,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.16.0,4.0.0)", + org.eclipse.core.variables;bundle-version="[3.4.600,4.0.0)", + org.eclipse.ltk.core.refactoring;bundle-version="[3.10.200,4.0.0)", + org.eclipse.text;bundle-version="[3.9.0,4.0.0)", com.ibm.icu;bundle-version="4.4.2", com.google.gson, org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF index 68affeb30da..892f88f2102 100644 --- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF @@ -102,27 +102,27 @@ Export-Package: org.eclipse.cdt.internal.corext;x-internal:=true, org.eclipse.cdt.ui.wizards, org.eclipse.cdt.ui.wizards.conversion, org.eclipse.cdt.utils.ui.controls -Require-Bundle: org.eclipse.cdt.core;bundle-version="[6.8.0,7.0.0)", - org.eclipse.compare;bundle-version="[3.7.600,4.0.0)", - org.eclipse.core.expressions;bundle-version="[3.6.400,4.0.0)", - org.eclipse.core.filesystem;bundle-version="[1.7.400,2.0.0)", - org.eclipse.core.resources;bundle-version="[3.13.400,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.15.300,4.0.0)", - org.eclipse.core.variables;bundle-version="[3.4.500,4.0.0)", - org.eclipse.help;bundle-version="[3.8.400,4.0.0)", - org.eclipse.jface.text;bundle-version="[3.15.200,4.0.0)", - org.eclipse.ltk.core.refactoring;bundle-version="[3.10.100,4.0.0)", - org.eclipse.ltk.ui.refactoring;bundle-version="[3.9.400,4.0.0)", - org.eclipse.search;bundle-version="[3.11.500,4.0.0)", - org.eclipse.ui;bundle-version="[3.113.0,4.0.0)", - org.eclipse.ui.console;bundle-version="[3.8.500,4.0.0)", - org.eclipse.ui.editors;bundle-version="[3.11.500,4.0.0)", - org.eclipse.ui.forms;bundle-version="[3.8.0,4.0.0)", - org.eclipse.ui.ide;bundle-version="[3.15.200,4.0.0)", - org.eclipse.ui.navigator;bundle-version="[3.8.0,4.0.0)", - org.eclipse.ui.navigator.resources;bundle-version="[3.6.500,4.0.0)", - org.eclipse.ui.views;bundle-version="[3.9.400,4.0.0)", - org.eclipse.ui.workbench.texteditor;bundle-version="[3.12.0,4.0.0)", +Require-Bundle: org.eclipse.cdt.core;bundle-version="[6.9.0,7.0.0)", + org.eclipse.compare;bundle-version="[3.7.700,4.0.0)", + org.eclipse.core.expressions;bundle-version="[3.6.500,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.7.500,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.13.500,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.16.0,4.0.0)", + org.eclipse.core.variables;bundle-version="[3.4.600,4.0.0)", + org.eclipse.help;bundle-version="[3.8.500,4.0.0)", + org.eclipse.jface.text;bundle-version="[3.15.300,4.0.0)", + org.eclipse.ltk.core.refactoring;bundle-version="[3.10.200,4.0.0)", + org.eclipse.ltk.ui.refactoring;bundle-version="[3.10.0,4.0.0)", + org.eclipse.search;bundle-version="[3.11.700,4.0.0)", + org.eclipse.ui;bundle-version="[3.114.0,4.0.0)", + org.eclipse.ui.console;bundle-version="[3.8.600,4.0.0)", + org.eclipse.ui.editors;bundle-version="[3.12.0,4.0.0)", + org.eclipse.ui.forms;bundle-version="[3.8.100,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.16.0,4.0.0)", + org.eclipse.ui.navigator;bundle-version="[3.9.0,4.0.0)", + org.eclipse.ui.navigator.resources;bundle-version="[3.7.0,4.0.0)", + org.eclipse.ui.views;bundle-version="[3.10.0,4.0.0)", + org.eclipse.ui.workbench.texteditor;bundle-version="[3.13.0,4.0.0)", com.ibm.icu;bundle-version="4.4.2", org.eclipse.e4.ui.css.swt.theme, org.eclipse.tools.templates.ui;bundle-version="[1.1.1,2.0.0)"