From 8940a9b33107fd2f3e131a89d6210e6ee36539c5 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Tue, 14 Mar 2023 13:28:32 -0400 Subject: [PATCH 1/2] Bump bundle versions changed due to new Tycho When we update Tycho we pull in a new version of ECJ which means we can get some differences in the class files even though there is no difference in the source. This commit bumps all the bundles that are affected by this. This is kept as a separate commit from the Tycho update because if we need to revert the Tycho update we would still need to bump all these bundles to make jgit timestamp qualifier happy. Part of #320 See also #308 --- codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF | 2 +- core/org.eclipse.cdt.core/META-INF/MANIFEST.MF | 2 +- debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF b/codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF index 5050959033c..ce4fe2fbce2 100644 --- a/codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF +++ b/codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.cdt.codan.checkers;singleton:=true -Bundle-Version: 3.5.100.qualifier +Bundle-Version: 3.5.200.qualifier Bundle-Activator: org.eclipse.cdt.codan.checkers.CodanCheckersActivator Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF index 723c5cf2840..be1c6d64c08 100644 --- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.core; singleton:=true -Bundle-Version: 8.1.0.qualifier +Bundle-Version: 8.1.100.qualifier Bundle-Activator: org.eclipse.cdt.core.CCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF index 092eebf8267..25f0e56de60 100644 --- a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.ui/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; singleton:=true -Bundle-Version: 8.5.100.qualifier +Bundle-Version: 8.5.200.qualifier Bundle-Activator: org.eclipse.cdt.debug.ui.CDebugUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/launchbar/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF b/launchbar/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF index c367057612e..e53cda1c703 100644 --- a/launchbar/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF +++ b/launchbar/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.launchbar.ui.controls;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.2.100.qualifier Bundle-Activator: org.eclipse.launchbar.ui.controls.internal.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.osgi.services;bundle-version="3.5.0", From c18d06e84d7865aa0542ab3a24fccf5f35827336 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Mon, 13 Mar 2023 14:25:58 -0400 Subject: [PATCH 2/2] Upgrade to Tycho 3.0.3 (latest) Part of #320 See also #308 --- .github/workflows/build-test.yml | 4 ---- .github/workflows/code-cleanliness.yml | 4 ---- .mvn/extensions.xml | 2 +- build/org.eclipse.cdt.autotools.docs/pom.xml | 8 +++++++- build/org.eclipse.cdt.meson.docs/pom.xml | 8 +++++++- debug/org.eclipse.cdt.debug.application.doc/pom.xml | 8 +++++++- .../pom.xml | 12 ------------ doc/org.eclipse.cdt.doc.isv/pom.xml | 7 ++++++- doc/org.eclipse.cdt.doc.user/pom.xml | 8 +++++++- pom.xml | 12 +++++++++--- 10 files changed, 44 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 37a8f38dee4..b3bbdabf96d 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -31,10 +31,6 @@ jobs: java-version: '17' distribution: 'temurin' cache: maven - - name: Setup Maven - uses: stCarolas/setup-maven@v.4.5 - with: - maven-version: 3.8.7 - name: Install GCC & GDB & other build essentials run: | sudo apt-get -y install build-essential gcc g++ gdb gdbserver diff --git a/.github/workflows/code-cleanliness.yml b/.github/workflows/code-cleanliness.yml index f24270ad5eb..ca667e81b9e 100644 --- a/.github/workflows/code-cleanliness.yml +++ b/.github/workflows/code-cleanliness.yml @@ -21,10 +21,6 @@ jobs: java-version: '17' distribution: 'temurin' cache: maven - - name: Setup Maven - uses: stCarolas/setup-maven@v.4.5 - with: - maven-version: 3.8.7 - name: Install dependencies run: | sudo apt-get update && sudo apt-get install -y --no-install-recommends \ diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 8cac6c9235b..f41af146d2d 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ org.eclipse.tycho tycho-build - 2.7.1 + 3.0.3 diff --git a/build/org.eclipse.cdt.autotools.docs/pom.xml b/build/org.eclipse.cdt.autotools.docs/pom.xml index 980ba0611a1..53dcdfd2a34 100644 --- a/build/org.eclipse.cdt.autotools.docs/pom.xml +++ b/build/org.eclipse.cdt.autotools.docs/pom.xml @@ -59,7 +59,13 @@ tycho-eclipserun-plugin ${tycho-version} - -application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index + + -application + org.eclipse.ant.core.antRunner + -buildfile + build-index.xml + build.index + org.apache.ant diff --git a/build/org.eclipse.cdt.meson.docs/pom.xml b/build/org.eclipse.cdt.meson.docs/pom.xml index aeb754d4953..13e76573a9c 100644 --- a/build/org.eclipse.cdt.meson.docs/pom.xml +++ b/build/org.eclipse.cdt.meson.docs/pom.xml @@ -59,7 +59,13 @@ tycho-eclipserun-plugin ${tycho-version} - -application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index + + -application + org.eclipse.ant.core.antRunner + -buildfile + build-index.xml + build.index + org.apache.ant diff --git a/debug/org.eclipse.cdt.debug.application.doc/pom.xml b/debug/org.eclipse.cdt.debug.application.doc/pom.xml index e033e4317f1..0e20a92cb10 100644 --- a/debug/org.eclipse.cdt.debug.application.doc/pom.xml +++ b/debug/org.eclipse.cdt.debug.application.doc/pom.xml @@ -59,7 +59,13 @@ tycho-eclipserun-plugin ${tycho-version} - -application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index + + -application + org.eclipse.ant.core.antRunner + -buildfile + customBuildCallbacks.xml + build.index + org.apache.ant diff --git a/debug/org.eclipse.cdt.debug.application.product/pom.xml b/debug/org.eclipse.cdt.debug.application.product/pom.xml index ae17cf436a3..254cd4f034e 100644 --- a/debug/org.eclipse.cdt.debug.application.product/pom.xml +++ b/debug/org.eclipse.cdt.debug.application.product/pom.xml @@ -49,12 +49,6 @@ archive-products - - - tar.gz - tar.gz - - @@ -129,12 +123,6 @@ archive-products - - - tar.gz - tar.gz - - diff --git a/doc/org.eclipse.cdt.doc.isv/pom.xml b/doc/org.eclipse.cdt.doc.isv/pom.xml index 98a8611ca6a..2bdc21cae10 100644 --- a/doc/org.eclipse.cdt.doc.isv/pom.xml +++ b/doc/org.eclipse.cdt.doc.isv/pom.xml @@ -60,7 +60,12 @@ tycho-eclipserun-plugin ${tycho-version} - -application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml + + -application + org.eclipse.ant.core.antRunner + -buildfile + buildDoc.xml + org.apache.ant diff --git a/doc/org.eclipse.cdt.doc.user/pom.xml b/doc/org.eclipse.cdt.doc.user/pom.xml index a71b7e3bd75..6fe47e88bcf 100644 --- a/doc/org.eclipse.cdt.doc.user/pom.xml +++ b/doc/org.eclipse.cdt.doc.user/pom.xml @@ -59,7 +59,13 @@ tycho-eclipserun-plugin ${tycho-version} - -application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index + + -application + org.eclipse.ant.core.antRunner + -buildfile + customBuildCallbacks.xml + build.index + org.apache.ant diff --git a/pom.xml b/pom.xml index cd789c17be8..7ccb48fbd38 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.7.5 + 3.0.3 1.3.4 jacoco http://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository @@ -831,7 +831,7 @@ - org.eclipse.tycho.extras + org.eclipse.tycho tycho-buildtimestamp-jgit ${tycho-version} @@ -948,7 +948,13 @@ tycho-eclipserun-plugin ${tycho-version} - -application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index + + -application + org.eclipse.ant.core.antRunner + -buildfile + customBuildCallbacks.xml + build.index + org.apache.ant