Merge pull request #643 from jarthana/master

[24] Merge BETA_JAVA24 into master

Author: jarthana

Jenkinsfile

@@ -10,7 +10,7 @@ pipeline {
 	}
 	tools {
 		maven 'apache-maven-latest'
-		jdk 'temurin-jdk21-latest'
+		jdk 'openjdk-jdk24-latest'
 	}
 	environment {
 		NON_MODULAR_JAVA_HOME = tool(type:'jdk', name:'temurin-jdk8-latest')
@@ -21,7 +21,7 @@ pipeline {
 				xvnc(useXauthority: true) {
 					sh """
 					mvn clean verify --batch-mode --fail-at-end -Dmaven.repo.local=$WORKSPACE/.m2/repository \
-						-Ptest-on-javase-23 -Pbree-libs -Papi-check -Pjavadoc\
+						-Ptest-on-javase-24 -Pbree-libs -Papi-check -Pjavadoc\
 						-Dmaven.test.failure.ignore=true\
 						-Dcompare-version-with-baselines.skip=false \
 						-Dproject.build.sourceEncoding=UTF-8 \

org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.debug.tests; singleton:=true
-Bundle-Version: 3.12.600.qualifier
+Bundle-Version: 3.12.650.qualifier
 Bundle-ClassPath: javadebugtests.jar
 Bundle-Activator: org.eclipse.jdt.debug.testplugin.JavaTestPlugin
 Bundle-Vendor: %providerName

org.eclipse.jdt.debug.tests/build.properties

@@ -26,7 +26,8 @@ bin.includes = plugin.xml,\
                java8/,\
                java9/,\
                java16_/,\
-               java23/
+               java23/,\
+               java24/
 source.javadebugtests.jar = test plugin/,\
                             tests/,\
                             console tests/

…clipse.jdt.debug.tests/java23/Main1.java …clipse.jdt.debug.tests/java24/Main1.javaorg.eclipse.jdt.debug.tests/java23/Main1.java renamed to org.eclipse.jdt.debug.tests/java24/Main1.java org.eclipse.jdt.debug.tests/java23/Main1.java renamed to org.eclipse.jdt.debug.tests/java24/Main1.java

@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2024 IBM Corporation.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation -- initial API and implementation
+ *******************************************************************************/
+public class Main21 {
+	public static void main(String[] args) throws InterruptedException {
+		try {
+			Thread.startVirtualThread(() -> {
+				int p = 21;
+				System.out.println("From Virtual Thread");
+			}).join();
+		} catch (Exception e) {
+
+		}
+	}
+}

…clipse.jdt.debug.tests/java23/Main2.java …clipse.jdt.debug.tests/java24/Main2.javaorg.eclipse.jdt.debug.tests/java23/Main2.java renamed to org.eclipse.jdt.debug.tests/java24/Main2.java org.eclipse.jdt.debug.tests/java23/Main2.java renamed to org.eclipse.jdt.debug.tests/java24/Main2.java

@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.debug.tests</artifactId>
-  <version>3.12.600-SNAPSHOT</version>
+  <version>3.12.650-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <testSuite>${project.artifactId}</testSuite>
@@ -65,5 +65,31 @@
 			</plugins>
 		</build>
 	</profile>
+	<profile>
+		<id>test-on-javase-24</id>
+		<build>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-toolchains-plugin</artifactId>
+					<executions>
+						<execution>
+							<phase>validate</phase>
+							<goals>
+								<goal>toolchain</goal>
+							</goals>
+						</execution>
+					</executions>
+					<configuration>
+						<toolchains>
+							<jdk>
+								<id>JavaSE-24</id>
+							</jdk>
+						</toolchains>
+					</configuration>
+				</plugin>
+			</plugins>
+		</build>
+	</profile>
   </profiles>
 </project>

org.eclipse.jdt.debug.tests/java24/Main21.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2000, 2024 IBM Corporation and others.
+ *  Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  *  This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License 2.0
@@ -66,6 +66,7 @@ public class JavaProjectHelper {
 	public static final String JAVA_SE_16_EE_NAME = "JavaSE-16";
 	public static final String JAVA_SE_21_EE_NAME = "JavaSE-21";
 	public static final String JAVA_SE_23_EE_NAME = "JavaSE-23";
+	public static final String JAVA_SE_24_EE_NAME = "JavaSE-24";
 
 	/**
 	 * path to the test src for 'testprograms'
@@ -100,6 +101,10 @@ public class JavaProjectHelper {
 	 * path to the 23 test source
 	 */
 	public static final IPath TEST_23_SRC_DIR = new Path("java23");
+	/**
+	 * path to the 24 test source
+	 */
+	public static final IPath TEST_24_SRC_DIR = new Path("java24");
 
 	/**
 	 * path to the compiler error java file
@@ -189,6 +194,15 @@ public static boolean isJava23_Compatible() {
 		return isCompatible(23);
 	}
 
+	/**
+	 * Returns if the currently running VM is version compatible with Java 24
+	 *
+	 * @return <code>true</code> if a Java 24 (or greater) VM is running <code>false</code> otherwise
+	 */
+	public static boolean isJava24_Compatible() {
+		return isCompatible(24);
+	}
+
 	/**
 	 * Returns if the current running system is compatible with the given Java minor version
 	 *

org.eclipse.jdt.debug.tests/pom.xml

@@ -181,6 +181,7 @@ public abstract class AbstractDebugTest extends TestCase implements  IEvaluation
 	public static final String ONESIX_PROJECT_NAME = "One_Six";
 	public static final String TWENTYONE_PROJECT_NAME = "Two_One";
 	public static final String TWENTYTHREE_PROJECT_NAME = "Two_Three";
+	public static final String TWENTYFOUR_PROJECT_NAME = "Two_Four";
 	public static final String BOUND_JRE_PROJECT_NAME = "BoundJRE";
 	public static final String CLONE_SUFFIX = "Clone";
 
@@ -241,6 +242,7 @@ public abstract class AbstractDebugTest extends TestCase implements  IEvaluation
 	private static boolean loaded16_ = false;
 	private static boolean loaded21 = false;
 	private static boolean loaded23 = false;
+	private static boolean loaded24 = false;
 	private static boolean loadedEE = false;
 	private static boolean loadedJRE = false;
 	private static boolean loadedMulti = false;
@@ -622,20 +624,15 @@ synchronized void assert21Project() {
 		}
 	}
 
-	/**
-	 * Creates the Java 23 compliant project
-	 */
 	synchronized void assert23Project() {
 		IJavaProject jp = null;
 		ArrayList<ILaunchConfiguration> cfgs = new ArrayList<>(1);
 		try {
 			if (!loaded23) {
 				jp = createProject(TWENTYTHREE_PROJECT_NAME, JavaProjectHelper.TEST_23_SRC_DIR.toString(), JavaProjectHelper.JAVA_SE_23_EE_NAME, false);
-				jp.setOption(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.ENABLED);
 				jp.setOption(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_23);
 				jp.setOption(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_23);
-				cfgs.add(createLaunchConfiguration(jp, "Main1"));
-				cfgs.add(createLaunchConfiguration(jp, "Main2"));
+				cfgs.add(createLaunchConfiguration(jp, "Main21"));
 				loaded23 = true;
 				waitForBuild();
 				assertNoErrorMarkersExist(jp.getProject());
@@ -655,6 +652,41 @@ synchronized void assert23Project() {
 		}
 	}
 
+	/**
+	 * Creates the Java 24 compliant project
+	 */
+	synchronized void assert24Project() {
+		IJavaProject jp = null;
+		ArrayList<ILaunchConfiguration> cfgs = new ArrayList<>(1);
+		try {
+			if (!loaded24) {
+				jp = createProject(TWENTYFOUR_PROJECT_NAME, JavaProjectHelper.TEST_24_SRC_DIR.toString(), JavaProjectHelper.JAVA_SE_24_EE_NAME, false);
+				jp.setOption(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.ENABLED);
+				jp.setOption(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_24);
+				jp.setOption(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_24);
+				jp.setOption(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_24);
+				cfgs.add(createLaunchConfiguration(jp, "Main1"));
+				cfgs.add(createLaunchConfiguration(jp, "Main2"));
+				cfgs.add(createLaunchConfiguration(jp, "Main21"));
+				loaded24 = true;
+				waitForBuild();
+				assertNoErrorMarkersExist(jp.getProject());
+			}
+		} catch (Exception e) {
+			try {
+				if (jp != null) {
+					jp.getProject().delete(true, true, null);
+					for (int i = 0; i < cfgs.size(); i++) {
+						cfgs.get(i).delete();
+					}
+				}
+			} catch (CoreException ce) {
+				// ignore
+			}
+			handleProjectCreationException(e, TWENTYFOUR_PROJECT_NAME, jp);
+		}
+	}
+
 	/**
 	 * Creates the 'BoundJRE' project used for the JRE testing
 	 */
@@ -696,9 +728,9 @@ void assertBoundeEeProject() {
 		        JavaProjectHelper.addSourceContainer(jp, JavaProjectHelper.SRC_DIR, JavaProjectHelper.BIN_DIR);
 
 		        // add VM specific JRE container
-				IExecutionEnvironment j2se14 = JavaRuntime.getExecutionEnvironmentsManager().getEnvironment(JavaProjectHelper.JAVA_SE_1_8_EE_NAME);
-		        assertNotNull("Missing J2SE-1.4 environment", j2se14);
-		        IPath path = JavaRuntime.newJREContainerPath(j2se14);
+				IExecutionEnvironment javase1_8 = JavaRuntime.getExecutionEnvironmentsManager().getEnvironment(JavaProjectHelper.JAVA_SE_1_8_EE_NAME);
+				assertNotNull("Missing JavaSE-1.8 environment", javase1_8);
+				IPath path = JavaRuntime.newJREContainerPath(javase1_8);
 		        JavaProjectHelper.addContainerEntry(jp, path);
 		        loadedEE = true;
 		        waitForBuild();
@@ -961,6 +993,16 @@ protected IJavaProject get23Project() {
 		return getJavaProject(TWENTYTHREE_PROJECT_NAME);
 	}
 
+	/**
+	 * Returns the 'Two_Four' project, used for Java 24 tests.
+	 *
+	 * @return the test project
+	 */
+	protected IJavaProject get24Project() {
+		assert24Project();
+		return getJavaProject(TWENTYFOUR_PROJECT_NAME);
+	}
+
 	/**
 	 * Returns the 'BoundJRE' project
 	 *

org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java

@@ -199,7 +199,7 @@ public AutomatedSuite() {
 		addTest(new TestSuite(ConfigurationEncodingTests.class));
 		addTest(new TestSuite(LaunchConfigurationManagerTests.class));
 		addTest(new TestSuite(LaunchConfigurationTests.class));
-		if (JavaProjectHelper.isJava23_Compatible()) {
+		if (JavaProjectHelper.isJava24_Compatible()) {
 			addTest(new TestSuite(InstanceMainMethodsTests.class));
 		}
 		addTest(new TestSuite(ProjectClasspathVariableTests.class));
@@ -420,7 +420,7 @@ public AutomatedSuite() {
 		if (JavaProjectHelper.isJava16_Compatible()) {
 			addTest(new TestSuite(RecordBreakpointTests.class));
 		}
-		if (Runtime.version().feature() == 23 && JavaProjectHelper.isJava23_Compatible()) {
+		if (JavaProjectHelper.isJava23_Compatible()) {
 			addTest(new TestSuite(VirtualThreadsDebugViewTests.class));
 		}
 	}