Add support for Java-25 and set up build with Java-25

- Add constants for Java-25
- Add compiler and wizard tests for Java-25.
- Add Java-25 profile to xtext-dev BOM
- Fix tests failing on Java-25:
  - java.util.Collections class is final in Java-25

Author: HannesWell

.github/workflows/maven.yml

@@ -14,14 +14,18 @@ jobs:
     strategy:
       matrix: # 'macos-14' is arm64
         os: ['ubuntu-22.04', 'macos-14', 'windows-2022']
-        java: [ 21 ]
+        java: [ 25 ]
         additional-maven-args: ['']
         additional-label: ['']
         include:
         - os: ubuntu-22.04
           java: 21
           additional-maven-args: -Pstrict-jdk-21
           additional-label: -strict
+        - os: ubuntu-22.04
+          java: 25
+          additional-maven-args: -Pstrict-jdk-25
+          additional-label: -strict
       fail-fast: false
     runs-on: ${{ matrix.os }}
 
@@ -82,7 +86,7 @@ jobs:
       - name: 'Set up Java'
         uses: actions/setup-java@v5
         with:
-          java-version: 21
+          java-version: 25
           distribution: 'temurin'
 
       - name: 'Cache Maven packages'
@@ -100,7 +104,7 @@ jobs:
           clean verify
           -f org.eclipse.xtext.maven.releng
           -B -fae -PuseJenkinsSnapshots
-          -Pstrict-jdk-21
+          -Pstrict-jdk-25
 
       - name: Archive Test Results
         uses: actions/upload-artifact@v6.0.0

Jenkinsfile

@@ -8,7 +8,7 @@ pipeline {
   parameters {
     choice(name: 'TARGET_PLATFORM', choices: ['r202403', 'r202406', 'r202409', 'r202412', 'r202503', 'r202506', 'r202509', 'r202512', 'latest'], description: 'Which Target Platform should be used?')
     // see https://wiki.eclipse.org/Jenkins#JDK
-    choice(name: 'JDK_VERSION', choices: [ '17', '21' ], description: 'Which JDK version should be used?')
+    choice(name: 'JDK_VERSION', choices: [ '17', '21', '25' ], description: 'Which JDK version should be used?')
   }
 
   triggers {
@@ -61,6 +61,7 @@ pipeline {
         // Set all Java version that can be discovered/selected by maven-toolchains-plugin
         JAVA_17_HOME = tool(type:'jdk', name:'temurin-jdk17-latest')
         JAVA_21_HOME = tool(type:'jdk', name:'temurin-jdk21-latest')
+        JAVA_25_HOME = tool(type:'jdk', name:'temurin-jdk25-latest')
       }
       steps {
         xvnc(useXauthority: true) {
@@ -171,7 +172,10 @@ def selectedTargetPlatform() {
     def isUpstream = isTriggeredByUpstream()
     def javaVersion = javaVersion()
 
-    if (isTriggeredByUpstream() && javaVersion>=21) {
+    if (isTriggeredByUpstream() && javaVersion>=25) {
+        println("Choosing 'latest' target since this build was triggered by upstream with Java ${javaVersion}")
+        return 'latest'
+    } else if (isTriggeredByUpstream() && javaVersion>=21) {
         println("Choosing 'latest' target since this build was triggered by upstream with Java ${javaVersion}")
         return 'latest'
     } else if (isTriggeredByUpstream() && javaVersion>=17) {

org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/imports/ImportOrganizerTest.xtend

@@ -2020,21 +2020,21 @@ class ImportOrganizerTest extends AbstractXtendTestCase {
 	// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=399519
 	@Test def testExtensionFeatureCallToStaticLocalFieldFromSuper() {
 		'''
-			import java.util.Collections
+			import java.util.ArrayList
 			
-			import static extension java.util.Collections.*
+			import static extension java.util.List.*
 
-			class Foo extends Collections {
+			class Foo extends ArrayList {
 				def foo() {
-					''.singleton
+					''.of
 				}
 			}
 		'''.assertIsOrganizedTo('''
-			import java.util.Collections
+			import java.util.ArrayList
 			
-			class Foo extends Collections {
+			class Foo extends ArrayList {
 				def foo() {
-					''.singleton
+					''.of
 				}
 			}
 		''')

org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/imports/ImportOrganizerTest.java

@@ -3875,36 +3875,36 @@ public void testExtensionFeatureCallToStaticLocal() {
   @Test
   public void testExtensionFeatureCallToStaticLocalFieldFromSuper() {
     StringConcatenation _builder = new StringConcatenation();
-    _builder.append("import java.util.Collections");
+    _builder.append("import java.util.ArrayList");
     _builder.newLine();
     _builder.newLine();
-    _builder.append("import static extension java.util.Collections.*");
+    _builder.append("import static extension java.util.List.*");
     _builder.newLine();
     _builder.newLine();
-    _builder.append("class Foo extends Collections {");
+    _builder.append("class Foo extends ArrayList {");
     _builder.newLine();
     _builder.append("\t");
     _builder.append("def foo() {");
     _builder.newLine();
     _builder.append("\t\t");
-    _builder.append("\'\'.singleton");
+    _builder.append("\'\'.of");
     _builder.newLine();
     _builder.append("\t");
     _builder.append("}");
     _builder.newLine();
     _builder.append("}");
     _builder.newLine();
     StringConcatenation _builder_1 = new StringConcatenation();
-    _builder_1.append("import java.util.Collections");
+    _builder_1.append("import java.util.ArrayList");
     _builder_1.newLine();
     _builder_1.newLine();
-    _builder_1.append("class Foo extends Collections {");
+    _builder_1.append("class Foo extends ArrayList {");
     _builder_1.newLine();
     _builder_1.append("\t");
     _builder_1.append("def foo() {");
     _builder_1.newLine();
     _builder_1.append("\t\t");
-    _builder_1.append("\'\'.singleton");
+    _builder_1.append("\'\'.of");
     _builder_1.newLine();
     _builder_1.append("\t");
     _builder_1.append("}");

org.eclipse.xtend.maven.plugin/src/test/java/org/eclipse/xtend/maven/XtendCompilerMojoIT.java

@@ -71,6 +71,12 @@ public void simpleJava21Project() throws Exception {
 		verifyErrorFreeLog(ROOT + "/simple-java21");
 	}
 
+	@Test
+	public void simpleJava25Project() throws Exception {
+		Assume.assumeTrue("Active only on Java 25 and later", JavaRuntimeVersion.isJava25OrLater());
+		verifyErrorFreeLog(ROOT + "/simple-java21");
+	}
+
 	@Test
 	public void encoding() throws Exception {
 		Verifier verifier = MavenVerifierUtil.newVerifier(ROOT + "/encoding");

org.eclipse.xtend.maven.plugin/src/test/resources/it/compile/simple-java25/.mvn/maven.config

@@ -0,0 +1 @@
+-Djava-25

org.eclipse.xtend.maven.plugin/src/test/resources/it/compile/simple-java25/pom.xml

@@ -0,0 +1,24 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.xtext</groupId>
+		<artifactId>it-tests-parent</artifactId>
+		<version>IT-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+	<artifactId>simple-java25</artifactId>
+	<properties>
+		<maven.compiler.source>25</maven.compiler.source>
+		<maven.compiler.target>25</maven.compiler.target>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.xtext</groupId>
+				<artifactId>xtend-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+</project>

org.eclipse.xtend.maven.plugin/src/test/resources/it/compile/simple-java25/src/main/java/test/JavaRecord.java

@@ -0,0 +1,7 @@
+package test;
+
+public record JavaRecord(String name) {
+	public XtendA foo(XtendA test) {
+		return test;
+	}
+}

org.eclipse.xtend.maven.plugin/src/test/resources/it/compile/simple-java25/src/main/java/test/XtendA.xtend

@@ -0,0 +1,11 @@
+package test
+
+class XtendA {
+	def JavaRecord newJavaRecord() {
+		return new JavaRecord("a test")
+	}
+
+	def String aName(JavaRecord r) {
+		r.name
+	}
+}

org.eclipse.xtext.common.types.eclipse.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java

@@ -14,6 +14,7 @@
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -319,18 +320,19 @@ public void testFindTypeByName_javaLangCharSequence_01() {
 	@Test
 	public void testFindTypeByName_javaLangCharSequence_02() {
 		String typeName = CharSequence.class.getName();
-		try {
-			Set<String> memberNames = Sets.newHashSet("length", "chars", "charAt", "codePoints", "subSequence", "toString");
-			assertMembers(typeName, memberNames);
-		} catch(AssertionError e) {
-			try {
-				Set<String> memberNamesJ11 = Sets.newHashSet("length", "chars", "charAt", "codePoints", "subSequence", "toString", "compare");
-				assertMembers(typeName, memberNamesJ11);
-			} catch (AssertionError e2) {
-				Set<String> memberNamesJ15 = Sets.newHashSet("length", "chars", "charAt", "codePoints", "isEmpty", "subSequence", "toString", "compare");
-				assertMembers(typeName, memberNamesJ15);
-			}
+		int javaVersion = Runtime.version().feature();
+		Set<String> expectedMemberNames = new HashSet<>(
+				Set.of("length", "chars", "charAt", "codePoints", "subSequence", "toString"));
+		if (javaVersion >= 11) {
+			expectedMemberNames.add("compare");
+		}
+		if (javaVersion >= 15) {
+			expectedMemberNames.add("isEmpty");
+		}
+		if (javaVersion >= 25) {
+			expectedMemberNames.add("getChars");
 		}
+		assertMembers(typeName, expectedMemberNames);
 	}
 
 	@Test