Update and consume third-party content

.github/workflows/ci.yml

@@ -9,18 +9,20 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         submodules: true
-    - name: Set up JDK 11
-      uses: actions/setup-java@v4
+    - name: Set up JDKs
+      uses: actions/setup-java@v5
       with:
-        java-version: 11
         distribution: temurin
+        java-version: |
+          11
+          21
     - name: Setup Maven
       run: echo "MAVEN_OPTS='-Xmx2048m'" > ~/.mavenrc
     - name: Cache maven repo
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       env:
         cache-name: cache-maven-repo
       with:

.mvn/extensions.xml

@@ -14,8 +14,8 @@
 -->
 <extensions>
 	<extension>
-		<groupId>org.eclipse.tycho.extras</groupId>
-		<artifactId>tycho-pomless</artifactId>
-		<version>1.7.0</version>
+		<groupId>org.eclipse.tycho</groupId>
+		<artifactId>tycho-build</artifactId>
+		<version>3.0.5</version>
 	</extension>
 </extensions>

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

README-MAINTAINER.md

@@ -17,8 +17,8 @@ git clone --recurse-submodule https://github.com/eclipse-embed-cdt/eclipse-plugi
 
 Production builds are run via
 [Jenkins](https://ci.eclipse.org/embed-cdt/)
-on the Eclipse Foundation infrastructure (CBI); for local builds, use the
-[Adopt OpenJDK 11](https://adoptopenjdk.net) and maven 3.6.
+on the Eclipse Foundation infrastructure (CBI); for local builds, use
+[Java 21](https://adoptium.net) and [Maven 3.9](https://maven.apache.org/).
 
 ## Development workflow
 

parent/pom.xml

@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<prerequisites>
-		<maven>3.6.3</maven>
+		<maven>3.9.11</maven>
 	</prerequisites>
 
 	<!-- https://maven.apache.org/pom.html groupId:artifactId:version are all
@@ -32,8 +32,8 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<!-- https://wiki.eclipse.org/Tycho/Release_Notes -->
-		<tycho.version>1.7.0</tycho.version>
+		<!-- https://github.com/eclipse-tycho/tycho/blob/main/RELEASE_NOTES.md -->
+		<tycho.version>3.0.5</tycho.version>
 
 		<!-- Silence a Maven warning -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,7 +42,7 @@
 		<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
 
 		<!-- Eclipse provided plug-ins for signing JARs with Eclipse infra -->
-		<cbi-plugins.version>1.3.1</cbi-plugins.version>
+		<cbi-plugins.version>1.5.2</cbi-plugins.version>
 
 		<semverVersion>6.6.1</semverVersion>
 
@@ -104,7 +104,6 @@
 				<artifactId>target-platform-configuration</artifactId>
 				<version>${tycho.version}</version>
 				<configuration>
-					<resolver>p2</resolver>
 					<pomDependencies>consider</pomDependencies>
 
 					<!-- Mandatory, without it Build is platform dependent. -->
@@ -154,35 +153,17 @@
 				</configuration>
 				<executions>
 					<execution>
-						<id>attach-source</id>
+						<id>plugin-source</id>
 						<goals>
 							<goal>plugin-source</goal>
 						</goals>
 					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tycho.version}</version>
-				<configuration>
-					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
-					</archive>
-					<reuseBrandingPlugin>false</reuseBrandingPlugin>
-				</configuration>
-				<executions>
 					<execution>
-						<id>source-feature</id>
+						<id>feature-source</id>
 						<phase>package</phase>
 						<goals>
-							<goal>source-feature</goal>
+							<goal>feature-source</goal>
 						</goals>
-						<configuration>
-							<excludes>
-								<plugin id="org.eclipse.embedcdt.doc.user" />
-							</excludes>
-						</configuration>
 					</execution>
 				</executions>
 			</plugin>
@@ -263,30 +244,6 @@
 		</pluginManagement>
 	</build>
 	<profiles>
-		<!-- Automatic profile for features that shouldn't generate sources -->
-		<profile>
-			<id>feature-no-source</id>
-			<activation>
-				<file>
-				<exists>feature-no-source.properties</exists>
-				</file>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.tycho.extras</groupId>
-						<artifactId>tycho-source-feature-plugin</artifactId>
-						<version>${tycho.version}</version>
-						<executions>
-							<execution>
-								<id>source-feature</id>
-								<phase>none</phase>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 		<profile>
 			<id>production</id>
 			<build>
@@ -305,6 +262,23 @@
 							</execution>
 						</executions>
 					</plugin>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-gpg-plugin</artifactId>
+						<version>${tycho.version}</version>
+						<executions>
+							<execution>
+								<id>pgpsigner</id>
+								<goals>
+									<goal>sign-p2-artifacts</goal>
+								</goals>
+								<configuration>
+									<keyname>01727E9DB95289B9</keyname>
+									<skipIfJarsigned>false</skipIfJarsigned>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>

plugins/org.eclipse.embedcdt.core/.classpath

@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/org.jsoup_1.7.2.v201411291515.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/json-simple-1.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/antlr-runtime-3.5.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.9.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.9.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.9.9.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ST4-4.0.8.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="target/classes"/>

plugins/org.eclipse.embedcdt.core/META-INF/MANIFEST.MF

@@ -490,124 +490,23 @@ Export-Package: org.eclipse.embedcdt.core,
    org.eclipse.embedcdt.managedbuild.cross.core,
    org.eclipse.embedcdt.managedbuild.cross.riscv.core,
    org.eclipse.embedcdt.packs.core,
-   org.eclipse.embedcdt.templates.core",
- org.json.simple;version="1.1.1";
-  x-friends:="org.eclipse.embedcdt.debug.gdbjtag.core,
-   org.eclipse.embedcdt,
-   org.eclipse.embedcdt.codered,
-   org.eclipse.embedcdt.codered.ui,
-   org.eclipse.embedcdt.core,
-   org.eclipse.embedcdt.debug.core,
-   org.eclipse.embedcdt.debug.gdbjtag,
-   org.eclipse.embedcdt.debug.gdbjtag.jlink,
-   org.eclipse.embedcdt.debug.gdbjtag.jlink.core,
-   org.eclipse.embedcdt.debug.gdbjtag.jlink.ui,
-   org.eclipse.embedcdt.debug.gdbjtag.openocd,
-   org.eclipse.embedcdt.debug.gdbjtag.openocd.core,
-   org.eclipse.embedcdt.debug.gdbjtag.openocd.ui,
-   org.eclipse.embedcdt.debug.gdbjtag.pyocd,
-   org.eclipse.embedcdt.debug.gdbjtag.pyocd.core,
-   org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui,
-   org.eclipse.embedcdt.debug.gdbjtag.qemu,
-   org.eclipse.embedcdt.debug.gdbjtag.qemu.core,
-   org.eclipse.embedcdt.debug.gdbjtag.qemu.ui,
-   org.eclipse.embedcdt.debug.gdbjtag.restart.ui,
-   org.eclipse.embedcdt.debug.gdbjtag.ui,
-   org.eclipse.embedcdt.debug.packs,
-   org.eclipse.embedcdt.doc.user,
-   org.eclipse.embedcdt.managedbuild.cross,
-   org.eclipse.embedcdt.managedbuild.cross.arm,
-   org.eclipse.embedcdt.managedbuild.cross.arm.core,
-   org.eclipse.embedcdt.managedbuild.cross.arm.ui,
-   org.eclipse.embedcdt.managedbuild.cross.core,
-   org.eclipse.embedcdt.managedbuild.cross.riscv,
-   org.eclipse.embedcdt.managedbuild.cross.riscv.core,
-   org.eclipse.embedcdt.managedbuild.cross.riscv.ui,
-   org.eclipse.embedcdt.managedbuild.cross.ui,
-   org.eclipse.embedcdt.managedbuild.packs.ui,
-   org.eclipse.embedcdt.packs,
-   org.eclipse.embedcdt.packs.core,
-   org.eclipse.embedcdt.packs.ui,
-   org.eclipse.embedcdt.templates.ad,
-   org.eclipse.embedcdt.templates.ad.ui,
-   org.eclipse.embedcdt.templates.core,
-   org.eclipse.embedcdt.templates.cortexm,
-   org.eclipse.embedcdt.templates.cortexm.ui,
-   org.eclipse.embedcdt.templates.xpack,
-   org.eclipse.embedcdt.templates.xpack.ui,
-   org.eclipse.embedcdt.templates.freescale,
-   org.eclipse.embedcdt.templates.freescale.pe.ui,
-   org.eclipse.embedcdt.templates.freescale.ui,
-   org.eclipse.embedcdt.templates.sifive,
-   org.eclipse.embedcdt.templates.sifive.ui,
-   org.eclipse.embedcdt.templates.stm,
-   org.eclipse.embedcdt.templates.stm.ui,
-   org.eclipse.embedcdt.ui",
- org.json.simple.parser;version="1.1.1";
-  x-friends:="org.eclipse.embedcdt,
-   org.eclipse.embedcdt.codered,
-   org.eclipse.embedcdt.codered.ui,
-   org.eclipse.embedcdt.core,
-   org.eclipse.embedcdt.debug.core,
-   org.eclipse.embedcdt.debug.gdbjtag,
-   org.eclipse.embedcdt.debug.gdbjtag.core,
-   org.eclipse.embedcdt.debug.gdbjtag.jlink,
-   org.eclipse.embedcdt.debug.gdbjtag.jlink.core,
-   org.eclipse.embedcdt.debug.gdbjtag.jlink.ui,
-   org.eclipse.embedcdt.debug.gdbjtag.openocd,
-   org.eclipse.embedcdt.debug.gdbjtag.openocd.core,
-   org.eclipse.embedcdt.debug.gdbjtag.openocd.ui,
-   org.eclipse.embedcdt.debug.gdbjtag.pyocd,
-   org.eclipse.embedcdt.debug.gdbjtag.pyocd.core,
-   org.eclipse.embedcdt.debug.gdbjtag.pyocd.ui,
-   org.eclipse.embedcdt.debug.gdbjtag.qemu,
-   org.eclipse.embedcdt.debug.gdbjtag.qemu.core,
-   org.eclipse.embedcdt.debug.gdbjtag.qemu.ui,
-   org.eclipse.embedcdt.debug.gdbjtag.restart.ui,
-   org.eclipse.embedcdt.debug.gdbjtag.ui,
-   org.eclipse.embedcdt.debug.packs,
-   org.eclipse.embedcdt.doc.user,
-   org.eclipse.embedcdt.managedbuild.cross,
-   org.eclipse.embedcdt.managedbuild.cross.arm,
-   org.eclipse.embedcdt.managedbuild.cross.arm.core,
-   org.eclipse.embedcdt.managedbuild.cross.arm.ui,
-   org.eclipse.embedcdt.managedbuild.cross.core,
-   org.eclipse.embedcdt.managedbuild.cross.riscv,
-   org.eclipse.embedcdt.managedbuild.cross.riscv.core,
-   org.eclipse.embedcdt.managedbuild.cross.riscv.ui,
-   org.eclipse.embedcdt.managedbuild.cross.ui,
-   org.eclipse.embedcdt.managedbuild.packs.ui,
-   org.eclipse.embedcdt.packs,
-   org.eclipse.embedcdt.packs.core,
-   org.eclipse.embedcdt.packs.ui,
-   org.eclipse.embedcdt.templates.ad,
-   org.eclipse.embedcdt.templates.ad.ui,
-   org.eclipse.embedcdt.templates.core,
-   org.eclipse.embedcdt.templates.cortexm,
-   org.eclipse.embedcdt.templates.cortexm.ui,
-   org.eclipse.embedcdt.templates.xpack,
-   org.eclipse.embedcdt.templates.xpack.ui,
-   org.eclipse.embedcdt.templates.freescale,
-   org.eclipse.embedcdt.templates.freescale.pe.ui,
-   org.eclipse.embedcdt.templates.freescale.ui,
-   org.eclipse.embedcdt.templates.sifive,
-   org.eclipse.embedcdt.templates.sifive.ui,
-   org.eclipse.embedcdt.templates.stm,
-   org.eclipse.embedcdt.templates.stm.ui,
-   org.eclipse.embedcdt.ui"
+   org.eclipse.embedcdt.templates.core"
+Import-Package: com.fasterxml.jackson.core;version="[2.21.0,3.0.0)",
+ com.fasterxml.jackson.databind;version="[2.21.0,3.0.0)",
+ org.antlr.runtime;version="[3.5.0,4.0.0)",
+ org.antlr.runtime.debug;version="[3.5.0,4.0.0)",
+ org.antlr.runtime.misc;version="[3.5.0,4.0.0)",
+ org.antlr.runtime.tree;version="[3.5.0,4.0.0)",
+ org.json.simple;version="1.1.1",
+ org.json.simple.parser;version="1.1.1",
+ org.jsoup;version="[1.22.0,2.0.0)",
+ org.jsoup.nodes;version="[1.22.0,2.0.0)"
 Require-Bundle: org.eclipse.cdt.core;bundle-version="7.0.0",
  org.eclipse.cdt.debug.core;bundle-version="8.5.0",
  org.eclipse.cdt.managedbuilder.core;bundle-version="9.0.0",
  org.eclipse.core.runtime;bundle-version="3.19.0",
  org.eclipse.core.variables;bundle-version="3.4.800",
  org.eclipse.debug.core;bundle-version="3.16.0",
  org.eclipse.core.expressions;bundle-version="3.7.0"
-Bundle-ClassPath: lib/antlr-runtime-3.5.2.jar,
- lib/jackson-annotations-2.9.9.jar,
- lib/jackson-core-2.9.9.jar,
- lib/jackson-databind-2.9.9.3.jar,
- lib/ST4-4.0.8.jar,
- lib/json-simple-1.1.1.jar,
- lib/org.jsoup_1.7.2.v201411291515.jar,
- .
+Bundle-ClassPath: .
 Automatic-Module-Name: org.eclipse.embedcdt.core

plugins/org.eclipse.embedcdt.core/build.properties

@@ -19,13 +19,7 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                plugin.properties,\
-               lib/antlr-runtime-3.5.2.jar,\
-               lib/jackson-annotations-2.9.9.jar,\
-               lib/jackson-core-2.9.9.jar,\
-               lib/jackson-databind-2.9.9.3.jar,\
-               lib/ST4-4.0.8.jar,\
-               lib/json-simple-1.1.1.jar,\
-               lib/org.jsoup_1.7.2.v201411291515.jar,\
+
                about.html,\
                .options
 src.includes = about.html