mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

[releng] Update to newer Tycho

Browse source 
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
This commit is contained in:
Jonah Graham 2021-09-23 14:34:25 -04:00
parent 3180471732
commit b0cb9b10d7
7 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.mvn/extensions.xml
View file

@ -3,6 +3,6 @@
<extension> <extension>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pomless</artifactId> <artifactId>tycho-pomless</artifactId>
<version>2.3.0</version> <version>2.5.0</version>
</extension> </extension>
</extensions> </extensions>

2
dsf/org.eclipse.cdt.dsf.ui/META-INF/MANIFEST.MF
View file

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.cdt.dsf.ui;singleton:=true 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-Activator: org.eclipse.cdt.dsf.internal.ui.DsfUIPlugin
Bundle-Localization: plugin Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="3.5.0", Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",

2
memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.debug.ui.memory.floatingpoint;singleton:=true 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 Bundle-Localization: plugin
Require-Bundle: org.eclipse.debug.core;bundle-version="3.7.100", Require-Bundle: org.eclipse.debug.core;bundle-version="3.7.100",
org.eclipse.debug.ui;bundle-version="3.8.1", org.eclipse.debug.ui;bundle-version="3.8.1",

2
memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.debug.ui.memory.memorybrowser;singleton:=true 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-Activator: org.eclipse.cdt.debug.ui.memory.memorybrowser.MemoryBrowserPlugin
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin

3
pom.xml
View file

@ -30,7 +30,7 @@
runs with. It may work with older versions, but this is not runs with. It may work with older versions, but this is not
tested or supported. --> tested or supported. -->
<required-maven-version>3.6.3</required-maven-version> <required-maven-version>3.6.3</required-maven-version>
<tycho-version>2.3.0</tycho-version> <tycho-version>2.5.0</tycho-version>
<cbi-plugins.version>1.3.1</cbi-plugins.version> <cbi-plugins.version>1.3.1</cbi-plugins.version>
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
<cdt-site>http://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository</cdt-site> <cdt-site>http://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository</cdt-site>
@ -809,6 +809,7 @@
<artifactId>tycho-packaging-plugin</artifactId> <artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<deriveHeaderFromProject>false</deriveHeaderFromProject>
<format>${qualifier.format}</format> <format>${qualifier.format}</format>
<timestampProvider>jgit</timestampProvider> <timestampProvider>jgit</timestampProvider>
<jgit.ignore> <jgit.ignore>

2
qt/org.eclipse.cdt.qt.ui/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.qt.ui;singleton:=true 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-Activator: org.eclipse.cdt.internal.qt.ui.Activator
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin

2
terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui;singleton:=true 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-Activator: org.eclipse.tm.terminal.view.ui.activator.UIPlugin
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400",