Build with Java-21 and maven 3.9.6

Configure the Tycho-surefire and tycho-compiler plug-ins to still use a
Java-17 JDK to run tests respectively build m2e projects.

Author: HannesWell

.github/workflows/maven.yml

@@ -26,7 +26,9 @@ jobs:
         submodules: true
     - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
-        java-version: '17'
+        java-version: |
+          17
+          21
         distribution: 'temurin'
     - name: Set up Maven
       uses: stCarolas/setup-maven@v5

Jenkinsfile

@@ -9,8 +9,8 @@ pipeline {
 		label "centos-latest"
 	}
 	tools {
-		maven 'apache-maven-3.9.5'
-		jdk 'openjdk-jdk17-latest'
+		maven 'apache-maven-3.9.6'
+		jdk 'openjdk-jdk21-latest'
 	}
 	stages {
 		stage('get m2e-core-tests') {

pom.xml

@@ -31,6 +31,7 @@
 		<surefire.timeout>900</surefire.timeout>
 		<tycho.surefire.useUIHarness>true</tycho.surefire.useUIHarness>
 		<tycho.surefire.useUIThread>true</tycho.surefire.useUIThread>
+		<tycho.useJDK>SYSTEM</tycho.useJDK>
 		<jacoco.destFile>../target/jacoco.exec</jacoco.destFile>
 		<tycho.scmUrl>scm:git:https://github.com/eclipse-m2e/m2e-core.git</tycho.scmUrl>
 		<trimStackTrace>false</trimStackTrace>
@@ -192,6 +193,9 @@
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-compiler-plugin</artifactId>
 					<version>${tycho-version}</version>
+					<configuration>
+						<useJDK>${tycho.useJDK}</useJDK>
+					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
@@ -203,6 +207,14 @@
 					<artifactId>tycho-p2-repository-plugin</artifactId>
 					<version>${tycho-version}</version>
 				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-surefire-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<configuration>
+						<useJDK>${tycho.useJDK}</useJDK>
+					</configuration>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
@@ -225,7 +237,6 @@
 						<plugin>
 							<groupId>org.eclipse.tycho</groupId>
 							<artifactId>tycho-surefire-plugin</artifactId>
-							<version>${tycho-version}</version>
 							<configuration>
 								<dependencies combine.children="append">
 									<!--this dependency is needed to detect and set the default VM correctly on Mac OS,

target-platform/target-platform.target

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
 <target name="m2e-target-platform">
-	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/eclipse/updates/4.31/"/>