From b0cb9b10d7a00a4d45bbb3f6062f8195ba52bf10 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Thu, 23 Sep 2021 14:34:25 -0400 Subject: [PATCH] [releng] Update to newer Tycho Newer Tycho has a new feature that adds an extra header (Bundle-License) to every plug-in. This commit includes omitting this new feature rather than bumping every single version of every bundle in CDT. See https://www.eclipse.org/tycho/sitedocs/tycho-packaging-plugin/package-plugin-mojo.html#deriveHeaderFromProject Bundles have version bumps due to newer Tycho including newer JDT compiler which leads to classfile differences. Change-Id: Id536d75a92a30582418324e27d74008869f7dd3a --- .mvn/extensions.xml | 2 +- dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- pom.xml | 3 ++- qt/org.eclipse.cdt.qt.ui/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 4632f0faf99..fdf2f7c85f4 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ org.eclipse.tycho.extras tycho-pomless - 2.3.0 + 2.5.0 diff --git a/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF index c05a3032ad3..303edf8b4dd 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF +++ b/dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.cdt.dsf.ui;singleton:=true -Bundle-Version: 2.6.200.qualifier +Bundle-Version: 2.6.300.qualifier Bundle-Activator: org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui;bundle-version="3.5.0", diff --git a/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/META-INF/MANIFEST.MF b/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/META-INF/MANIFEST.MF index 31e71292695..88d8d565c04 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/META-INF/MANIFEST.MF +++ b/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.debug.ui.memory.floatingpoint;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.1.100.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.debug.core;bundle-version="3.7.100", org.eclipse.debug.ui;bundle-version="3.8.1", diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF index f6425cbcbb6..66734e5c096 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF +++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.debug.ui.memory.memorybrowser;singleton:=true -Bundle-Version: 1.4.200.qualifier +Bundle-Version: 1.4.300.qualifier Bundle-Activator: org.eclipse.cdt.debug.ui.memory.memorybrowser.MemoryBrowserPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/pom.xml b/pom.xml index 4c503405e9e..ea8bab65291 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ runs with. It may work with older versions, but this is not tested or supported. --> 3.6.3 - 2.3.0 + 2.5.0 1.3.1 jacoco http://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository @@ -809,6 +809,7 @@ tycho-packaging-plugin ${tycho-version} + false ${qualifier.format} jgit diff --git a/qt/org.eclipse.cdt.qt.ui/META-INF/MANIFEST.MF b/qt/org.eclipse.cdt.qt.ui/META-INF/MANIFEST.MF index f71e440b5ca..0c7a2089ee5 100644 --- a/qt/org.eclipse.cdt.qt.ui/META-INF/MANIFEST.MF +++ b/qt/org.eclipse.cdt.qt.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.qt.ui;singleton:=true -Bundle-Version: 2.1.200.qualifier +Bundle-Version: 2.1.300.qualifier Bundle-Activator: org.eclipse.cdt.internal.qt.ui.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF index 30b47f72fca..9c7c4dbf1be 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui;singleton:=true -Bundle-Version: 4.10.0.qualifier +Bundle-Version: 4.10.100.qualifier Bundle-Activator: org.eclipse.tm.terminal.view.ui.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",