Merge branch 'eclipse-jdt:master' into master

Author: carstenartur

Jenkinsfile

@@ -10,7 +10,7 @@ pipeline {
 	}
 	tools {
 		maven 'apache-maven-latest'
-		jdk 'openjdk-jdk25-latest'
+		jdk 'openjdk-jdk26-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-25 -Pbree-libs -Papi-check -Pjavadoc\
+						-Ptest-on-javase-26 -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.jdi.tests/.settings/org.eclipse.jdt.core.prefs

@@ -43,7 +43,7 @@ org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
 org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JDI Tests
 Bundle-SymbolicName: org.eclipse.jdt.debug.jdi.tests; singleton:=true
-Bundle-Version: 1.2.100.qualifier
+Bundle-Version: 1.2.200.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse
 Require-Bundle: org.junit,

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

@@ -14,11 +14,11 @@
   <parent>
     <artifactId>eclipse.jdt.debug</artifactId>
     <groupId>eclipse.jdt.debug</groupId>
-    <version>4.39.0-SNAPSHOT</version>
+    <version>4.40.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.debug.jdi.tests</artifactId>
-  <version>1.2.100-SNAPSHOT</version>
+  <version>1.2.200-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <testSuite>${project.artifactId}</testSuite>

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventWaiter.java

@@ -116,8 +116,8 @@ public boolean modificationWatchpoint(ModificationWatchpointEvent event) {
 	 * Notify any object that is waiting for an event.
 	 */
 	synchronized protected void notifyEvent(Event event) {
-		notify();
 		fEvent = event;
+		notify();
 	}
 	/**
 	 * @see org.eclipse.debug.jdi.tests.EventListener#step(com.sun.jdi.event.StepEvent)

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodExitEventWaiter.java

@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2026 Simeon Andreev and others.
+ *
+ * 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:
+ *     Simeon Andreev - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.debug.jdi.tests;
+
+import com.sun.jdi.event.MethodExitEvent;
+import com.sun.jdi.request.EventRequest;
+/**
+ * Listen for MethodExitEvent for a specific method.
+ */
+public class MethodExitEventWaiter extends EventWaiter {
+	protected String fMethodName;
+
+	/**
+	 * Constructor
+	 */
+	public MethodExitEventWaiter(EventRequest request, boolean shouldGo, String methodName) {
+		super(request, shouldGo);
+		fMethodName = methodName;
+	}
+
+	/**
+	 * @see org.eclipse.debug.jdi.tests.EventWaiter#methodExit((com.sun.jdi.event.MethodExitEvent)
+	 */
+	@Override
+	public boolean methodExit(MethodExitEvent event) {
+		if (event.method().name().equals(fMethodName)) {
+			notifyEvent(event);
+			return fShouldGo;
+		}
+		return true;
+	}
+}

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodReturnValuesTests.java

@@ -95,7 +95,7 @@ public void testGetVoidMethodReturnValue() {
 				req = erm.createMethodExitRequest();
 				req.addClassFilter("org.eclipse.debug.jdi.tests.program.*");
 				req.enable();
-				waiter = new EventWaiter(req, true);
+				waiter = new MethodExitEventWaiter(req, true, "print");
 				fEventReader.addEventListener(waiter);
 				tref.resume();
 				event = (MethodExitEvent)waiter.waitEvent(10000);
@@ -137,7 +137,7 @@ public void testGetStringMethodReturnValue() {
 				req = erm.createMethodExitRequest();
 				req.addClassFilter("org.eclipse.debug.jdi.tests.program.*");
 				req.enable();
-				waiter = new EventWaiter(req, true);
+				waiter = new MethodExitEventWaiter(req, true, "foo");
 				fEventReader.addEventListener(waiter);
 				tref.resume();
 				event = (MethodExitEvent)waiter.waitEvent(5000);
@@ -179,7 +179,7 @@ public void testGetIntMethodReturnValue() {
 				req = erm.createMethodExitRequest();
 				req.addClassFilter("org.eclipse.debug.jdi.tests.program.*");
 				req.enable();
-				waiter = new EventWaiter(req, true);
+				waiter = new MethodExitEventWaiter(req, true, "getInt");
 				fEventReader.addEventListener(waiter);
 				tref.resume();
 				event = (MethodExitEvent)waiter.waitEvent(5000);
@@ -221,7 +221,7 @@ public void testGetBooleanMethodReturnValue() {
 				req = erm.createMethodExitRequest();
 				req.addClassFilter("org.eclipse.debug.jdi.tests.program.*");
 				req.enable();
-				waiter = new EventWaiter(req, true);
+				waiter = new MethodExitEventWaiter(req, true, "getBoolean");
 				fEventReader.addEventListener(waiter);
 				tref.resume();
 				event = (MethodExitEvent)waiter.waitEvent(5000);
@@ -263,7 +263,7 @@ public void testGetLongMethodReturnValue() {
 				req = erm.createMethodExitRequest();
 				req.addClassFilter("org.eclipse.debug.jdi.tests.program.*");
 				req.enable();
-				waiter = new EventWaiter(req, true);
+				waiter = new MethodExitEventWaiter(req, true, "getLong");
 				fEventReader.addEventListener(waiter);
 				tref.resume();
 				event = (MethodExitEvent)waiter.waitEvent(5000);

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -75,6 +75,9 @@ public static void main(java.lang.String[] args) {
 	 * Test that we received the event.
 	 */
 	public void testJDIVMDeath() {
+		if (Runtime.version().feature() == 26) {
+			return;
+		}
 		assertTrue("Should trigger VMDisconnectEvent or VMDeathEvent", fVMDisconnectEvent instanceof VMDeathEvent
 				|| fVMDisconnectEvent instanceof VMDisconnectEvent);
 	}

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

@@ -47,7 +47,7 @@ org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
 org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

org.eclipse.jdt.debug.tests/JDT Debug Test Suite.launch

@@ -27,7 +27,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-26"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jdt.debug.tests.AutomatedSuite"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jdt.debug.tests"/>