From eda9779aa00fd5bbe40df0a845c51591c672dbf0 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Thu, 30 Apr 2020 14:21:48 -0400 Subject: [PATCH] Bug 562498: Prevent end of life Arduino from installing on newer CDT When a user does an upgrade with Arduino installed and an upgrade is done now that Arduino is removed from master they can get into a broken state because Arduino plug-ins had not traditionally defined upper ranges. This commit adds such limits so users will get a fail to upgrade error to CDT 10 if they have Arduino installed. Change-Id: I05e7f40e21dd1a2f511d3d0ced13dac49ec0bec1 --- .../META-INF/MANIFEST.MF | 14 +++++++------- .../META-INF/MANIFEST.MF | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/META-INF/MANIFEST.MF b/toolchains/arduino/org.eclipse.cdt.arduino.core/META-INF/MANIFEST.MF index b812dba057f..454940b1b09 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino.core/META-INF/MANIFEST.MF +++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/META-INF/MANIFEST.MF @@ -2,22 +2,22 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.arduino.core;singleton:=true -Bundle-Version: 2.1.300.qualifier +Bundle-Version: 2.1.301.qualifier Bundle-Activator: org.eclipse.cdt.arduino.core.internal.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.debug.core, - org.eclipse.cdt.core, - org.eclipse.launchbar.core, + org.eclipse.cdt.core;bundle-version="[6.11.1,7.0.0)", + org.eclipse.launchbar.core;bundle-version="[2.3.100,3.0.0)", org.eclipse.remote.core;bundle-version="2.0.0", - org.eclipse.cdt.native.serial;bundle-version="1.0.0", + org.eclipse.cdt.native.serial;bundle-version="[1.1.400,2.0.0)", org.eclipse.remote.serial.core;bundle-version="1.0.0", com.google.gson;bundle-version="2.2.4", org.apache.commons.compress;bundle-version="1.6.0", - org.eclipse.launchbar.remote.core;bundle-version="1.0.0", - org.eclipse.tools.templates.freemarker;bundle-version="1.0.0";visibility:=reexport, - org.eclipse.cdt.build.gcc.core;bundle-version="1.0.0" + org.eclipse.launchbar.remote.core;bundle-version="[1.0.100,2.0.0)", + org.eclipse.tools.templates.freemarker;bundle-version="[1.1.100,2.0.0)";visibility:=reexport, + org.eclipse.cdt.build.gcc.core;bundle-version="[1.0.200,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF b/toolchains/arduino/org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF index 9656501b8e0..e87abd8e051 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF +++ b/toolchains/arduino/org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.arduino.ui;singleton:=true -Bundle-Version: 2.1.500.qualifier +Bundle-Version: 2.1.501.qualifier Bundle-Activator: org.eclipse.cdt.arduino.ui.internal.Activator Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.expressions, @@ -11,17 +11,17 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui.ide, org.eclipse.ui.forms, org.eclipse.debug.ui, - org.eclipse.launchbar.core, - org.eclipse.cdt.arduino.core, + org.eclipse.launchbar.core;bundle-version="[2.3.100,3.0.0)", + org.eclipse.cdt.arduino.core;bundle-version="[2.1.300,3.0.0)", org.eclipse.remote.core;bundle-version="2.0.0", org.eclipse.remote.ui;bundle-version="2.0.0", - org.eclipse.cdt.native.serial;bundle-version="1.0.0", - org.eclipse.tools.templates.ui;bundle-version="1.0.0", + org.eclipse.cdt.native.serial;bundle-version="[1.1.400,2.0.0)", + org.eclipse.tools.templates.ui;bundle-version="[1.1.100,2.0.0)", org.eclipse.launchbar.remote.ui;bundle-version="1.0.0", - org.eclipse.tm.terminal.connector.cdtserial;bundle-version="4.3.0", - org.eclipse.tm.terminal.view.ui;bundle-version="4.2.100", - org.eclipse.tm.terminal.view.core;bundle-version="4.2.0", - org.eclipse.tm.terminal.control;bundle-version="4.2.0" + org.eclipse.tm.terminal.connector.cdtserial;bundle-version="[4.6.0,5.0.0)", + org.eclipse.tm.terminal.view.ui;bundle-version="[4.6.0,5.0.0)", + org.eclipse.tm.terminal.view.core;bundle-version="[4.6.0,5.0.0)", + org.eclipse.tm.terminal.control;bundle-version="[4.6.1,5.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName