update jdt.core to S4_26_0_RC2
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/util/JrtUtilTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/util/JrtUtilTest.java
index be5993e..1d9d9ff 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/util/JrtUtilTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/util/JrtUtilTest.java
@@ -64,7 +64,7 @@
Object jrtSystem2 = JRTUtil.getJrtSystem(this.image, String.valueOf(majorVersionSegment));
assertSame(jrtSystem, jrtSystem2);
- jrtSystem2 = JRTUtil.getJrtSystem(this.image, String.valueOf(--majorVersionSegment));
+ jrtSystem2 = JRTUtil.getJrtSystem(this.image, String.valueOf(majorVersionSegment-2));
assertNotSame(jrtSystem, jrtSystem2);
Object jrtSystem3 = JRTUtil.getJrtSystem(this.image);
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/util/AbstractCompilerTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/util/AbstractCompilerTest.java
index a5117cd..ce44f47 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/util/AbstractCompilerTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/util/AbstractCompilerTest.java
@@ -321,6 +321,15 @@
public static int getPossibleComplianceLevels() {
if (possibleComplianceLevels == UNINITIALIZED) {
String specVersion = System.getProperty("java.specification.version");
+ // During the EA phase of development, the above property is set to the
+ // latest version, for e.g. "20", but the java.version that will be tested
+ // inside initReflectionVersion() later on will be of the format "20-ea" thus
+ // causing an exception. The following code will ensure that we ignore such cases
+ // until the latest version has been properly added in CompilerOptions.
+ int spec = Integer.parseInt(specVersion);
+ if (spec > Integer.parseInt(CompilerOptions.getLatestVersion())) {
+ specVersion = CompilerOptions.getLatestVersion();
+ }
isJRE19Plus = CompilerOptions.VERSION_19.equals(specVersion);
isJRE18Plus = isJRE19Plus || CompilerOptions.VERSION_18.equals(specVersion);
isJRE17Plus = isJRE18Plus || CompilerOptions.VERSION_17.equals(specVersion);