refact: upgrade to Java 21 and require Eclipse 2024-06+

Author: sebthom

.github/workflows/build.yml

@@ -129,18 +129,18 @@ jobs:
         sudo apt-get install --no-install-recommends -y xdg-utils
 
 
-    - name: "Install: JDK 17 for Compilation ☕"
+    - name: "Install: JDK 21 for Compilation ☕"
       uses: actions/setup-java@v5  # https://github.com/actions/setup-java
       with:
         distribution: temurin
-        java-version: 17
+        java-version: 21
 
 
-    - name: "Install: JDK 21 for Maven/Tycho ☕"
+    - name: "Install: JDK 25 for Maven/Tycho ☕"
       uses: actions/setup-java@v5  # https://github.com/actions/setup-java
       with:
         distribution: temurin
-        java-version: 21
+        java-version: 25
 
 
     - name: "Cache: Local Maven Repository"

Jenkinsfile

@@ -29,19 +29,19 @@ pipeline {
 		stage('Setup Maven Toolchains') {
 			steps {
 				script { try {
-					def jdk17 = tool name: 'temurin-jdk17-latest', type: 'jdk'
+					def jdk21 = tool name: 'temurin-jdk21-latest', type: 'jdk'
 
 					// Generate toolchains.xml for Maven Toolchains plugin
 					writeFile file: "/tmp/toolchains.xml", text: """
 <toolchains>
 	<toolchain>
 		<type>jdk</type>
 		<provides>
-			<version>17</version>
+			<version>21</version>
 			<vendor>temurin</vendor>
 		</provides>
 		<configuration>
-			<jdkHome>${jdk17}</jdkHome>
+			<jdkHome>${jdk21}</jdkHome>
 		</configuration>
 	</toolchain>
 </toolchains>

README.md

@@ -22,13 +22,14 @@ The latest snapshot build can be installed from the update site [https://downloa
 
 TM4E version | Min. Eclipse version
 -------------|--------------------
-[latest](https://download.eclipse.org/tm4e/releases/latest/) | [2023-09](https://projects.eclipse.org/releases/2023-09) ([4.29](https://projects.eclipse.org/projects/eclipse/releases/4.29.0))
-[0.9.0](https://download.eclipse.org/tm4e/releases/0.9/)+    | [2023-09](https://projects.eclipse.org/releases/2023-09) ([4.29](https://projects.eclipse.org/projects/eclipse/releases/4.29.0))
-[0.8.1](https://download.eclipse.org/tm4e/releases/0.8.1/)+  | [2023-06](https://projects.eclipse.org/releases/2023-06) ([4.28](https://projects.eclipse.org/projects/eclipse/releases/4.28.0))
-[0.8](https://download.eclipse.org/tm4e/releases/0.8/)+      | [2023-03](https://projects.eclipse.org/releases/2023-03) ([4.27](https://projects.eclipse.org/projects/eclipse/releases/4.27.0))
-[0.6.3](https://download.eclipse.org/tm4e/releases/0.6.3/)+  | [2022-12](https://projects.eclipse.org/releases/2022-12) ([4.26](https://projects.eclipse.org/projects/eclipse/releases/4.26.0))
-[0.6.2](https://download.eclipse.org/tm4e/releases/0.6.2/)+  | [2022-09](https://projects.eclipse.org/releases/2022-09) ([4.25](https://projects.eclipse.org/projects/eclipse/releases/4.25.0))
-[0.6.0](https://download.eclipse.org/tm4e/releases/0.6.0/)+  | [2022-03](https://projects.eclipse.org/releases/2022-03) ([4.23](https://projects.eclipse.org/projects/eclipse/releases/4.23.0))
+[latest](https://download.eclipse.org/tm4e/releases/latest/)  | [2024-06](https://projects.eclipse.org/releases/2024-06) ([4.32](https://projects.eclipse.org/projects/eclipse/releases/4.32.0))
+[0.16.0](https://download.eclipse.org/tm4e/releases/0.16.0/)+ | [2024-06](https://projects.eclipse.org/releases/2024-06) ([4.32](https://projects.eclipse.org/projects/eclipse/releases/4.32.0))
+[0.9.0](https://download.eclipse.org/tm4e/releases/0.9.0/)+   | [2023-09](https://projects.eclipse.org/releases/2023-09) ([4.29](https://projects.eclipse.org/projects/eclipse/releases/4.29.0))
+[0.8.1](https://download.eclipse.org/tm4e/releases/0.8.1/)+   | [2023-06](https://projects.eclipse.org/releases/2023-06) ([4.28](https://projects.eclipse.org/projects/eclipse/releases/4.28.0))
+[0.8](https://download.eclipse.org/tm4e/releases/0.8/)+       | [2023-03](https://projects.eclipse.org/releases/2023-03) ([4.27](https://projects.eclipse.org/projects/eclipse/releases/4.27.0))
+[0.6.3](https://download.eclipse.org/tm4e/releases/0.6.3/)+   | [2022-12](https://projects.eclipse.org/releases/2022-12) ([4.26](https://projects.eclipse.org/projects/eclipse/releases/4.26.0))
+[0.6.2](https://download.eclipse.org/tm4e/releases/0.6.2/)+   | [2022-09](https://projects.eclipse.org/releases/2022-09) ([4.25](https://projects.eclipse.org/projects/eclipse/releases/4.25.0))
+[0.6.0](https://download.eclipse.org/tm4e/releases/0.6.0/)+   | [2022-03](https://projects.eclipse.org/releases/2022-03) ([4.23](https://projects.eclipse.org/projects/eclipse/releases/4.23.0))
 
 
 ### 2) as a Java API with Maven

org.eclipse.tm4e.core.tests/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>

org.eclipse.tm4e.core.tests/.settings/org.eclipse.jdt.core.prefs

@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -129,7 +129,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false

org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.tm4e.core.tests;singleton:=true
-Bundle-Version: 0.15.2.qualifier
+Bundle-Version: 0.16.0.qualifier
 Require-Bundle: org.apache.batik.css,
  org.apache.batik.util,
  com.google.gson,
@@ -15,6 +15,6 @@ Import-Package: org.junit.jupiter.api,
  org.junit.jupiter.api.function,
  org.w3c.css.sac,
  org.w3c.css.sac.helpers
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.tm4e.core.tests

org.eclipse.tm4e.core.tests/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>org.eclipse.tm4e</artifactId>
-		<version>0.15.2-SNAPSHOT</version>
+		<version>0.16.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.tm4e.core.tests</artifactId>

org.eclipse.tm4e.core/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

org.eclipse.tm4e.core/.settings/org.eclipse.jdt.core.prefs

@@ -14,9 +14,9 @@ org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Ownin
 org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -134,7 +134,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false

org.eclipse.tm4e.core/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.tm4e.core
-Bundle-Version: 0.15.2.qualifier
+Bundle-Version: 0.16.0.qualifier
 Require-Bundle: com.google.gson;bundle-version="[2.13.1,3.0.0)",
  org.apache.batik.css;bundle-version="[1.19.0,2.0.0)",
  org.apache.batik.util;bundle-version="[1.19.0,2.0.0)",
@@ -14,7 +14,7 @@ Require-Bundle: com.google.gson;bundle-version="[2.13.1,3.0.0)",
 Import-Package: org.w3c.css.sac,
  org.w3c.css.sac.helpers,
  org.w3c.dom.css
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: org.eclipse.tm4e.core,
  org.eclipse.tm4e.core.grammar,
  org.eclipse.tm4e.core.internal.grammar;x-friends:="org.eclipse.tm4e.core.tests,org.eclipse.tm4e.ui",