Update MavenEnvVars

Author: sormuras

platform-tooling-support-tests/src/main/java/platform/tooling/support/ProcessStarters.java

@@ -50,20 +50,12 @@ public static ProcessStarter gradlew() {
 				.addArguments("-PjunitVersion=" + Helper.version());
 	}
 
-	public static ProcessStarter maven() {
-		return maven(currentJdkHome());
-	}
-
 	public static ProcessStarter maven(Path javaHome) {
-		var starter = new ProcessStarter() //
+		return new ProcessStarter() //
 				.executable(Path.of(System.getProperty("mavenDistribution")).resolve("bin").resolve(
 					windowsOrOtherExecutable("mvn.cmd", "mvn")).toAbsolutePath()) //
 				.putEnvironment("JAVA_HOME", javaHome) //
 				.addArguments("-Djunit.version=" + Helper.version());
-		if (Runtime.version().feature() >= 26) {
-			starter.putEnvironment("MAVEN_OPTS", "--enable-final-field-mutation=ALL-UNNAMED");
-		}
-		return starter;
 	}
 
 	private static String windowsOrOtherExecutable(String cmdOrExe, String other) {

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenEnvVars.java

@@ -10,19 +10,27 @@
 
 package platform.tooling.support.tests;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import org.junit.jupiter.api.condition.JRE;
 
 final class MavenEnvVars {
 
-	private static final Map<String, String> FOR_JDK24_AND_LATER = Map.of("MAVEN_OPTS", String.join(" ", //
+	private static final List<String> FOR_JDK24_AND_LATER = List.of( //
 		"--enable-native-access=ALL-UNNAMED", // https://issues.apache.org/jira/browse/MNG-8248
 		"--sun-misc-unsafe-memory-access=allow" // https://issues.apache.org/jira/browse/MNG-8399
-	));
+	);
+	private static final List<String> FOR_JDK26_AND_LATER = List.of( //
+		"--enable-final-field-mutation=ALL-UNNAMED" // https://github.com/junit-team/junit-framework/issues/5173
+	);
 
 	static Map<String, String> forJre(JRE jre) {
-		return jre.compareTo(JRE.JAVA_24) >= 0 ? FOR_JDK24_AND_LATER : Map.of();
+		var list = new ArrayList<String>();
+		if (jre.compareTo(JRE.JAVA_24) >= 0) list.addAll(FOR_JDK24_AND_LATER);
+		if (jre.compareTo(JRE.JAVA_26) >= 0) list.addAll(FOR_JDK26_AND_LATER);
+		return list.isEmpty() ? Map.of() : Map.of("MAVEN_OPTS", String.join(" ", list));
 	}
 
 	private MavenEnvVars() {