Merge branch 'master' into dependabot/github_actions/actions/setup-ja…

…va-4

.github/workflows/codeql.yml

@@ -0,0 +1,13 @@
+name: CodeQL call
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  schedule:
+    - cron: '15 8 * * 1'
+
+jobs:
+  callCodeQLworkflow:
+    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/codeQLworkflow.yml@master

.mvn/extensions.xml

@@ -3,6 +3,6 @@
 	<extension>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-build</artifactId>
-		<version>4.0.4</version>
+		<version>4.0.7</version>
 	</extension>
 </extensions>

.mvn/maven.config

@@ -0,0 +1 @@
+-Pbuild-individual-bundles

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

Jenkinsfile

@@ -18,7 +18,8 @@ pipeline {
 				wrap([$class: 'Xvnc', useXauthority: true]) {
 					sh """
 					mvn clean verify --batch-mode --fail-at-end -Dmaven.repo.local=$WORKSPACE/.m2/repository \
-						-Pbuild-individual-bundles -Ptest-on-javase-21 -Pbree-libs -Papi-check\
+						-Ptest-on-javase-21 -Pbree-libs -Papi-check -Pjavadoc\
+						-Dmaven.test.failure.ignore=true\
 						-Dcompare-version-with-baselines.skip=false \
 						-Dproject.build.sourceEncoding=UTF-8 \
 						-DDetectVMInstallationsJob.disabled=true \
@@ -30,11 +31,18 @@ pipeline {
 			post {
 				always {
 					archiveArtifacts artifacts: '*.log,*/target/work/data/.metadata/*.log,*/tests/target/work/data/.metadata/*.log,apiAnalyzer-workspace/.metadata/*.log', allowEmptyArchive: true
+					// The following lines use the newest build on master that did not fail a reference
+					// To not fail master build on failed test maven needs to be started with "-Dmaven.test.failure.ignore=true" it will then only marked unstable.
+					// To not fail the build also "unstable: true" is used to only mark the build unstable instead of failing when qualityGates are missed
+					// Also do not record mavenConsole() as failing tests are logged with ERROR duplicating the failure into the "Maven" plugin
+					// To accept unstable builds (test errors or new warnings introduced by third party changes) as reference using "ignoreQualityGate:true"
+					// To only show warnings related to the PR on a PR using "publishAllIssues:false"
+					// The eclipse compiler name is changed because the logfile not only contains ECJ but also API warnings.
+					// "pattern:" is used to collect warnings in dedicated files avoiding output of junit tests treated as warnings   
 					junit '**/target/surefire-reports/*.xml'
 					discoverGitReferenceBuild referenceJob: 'eclipse.jdt.debug-github/master'
-					recordIssues publishAllIssues:false, ignoreQualityGate:true, tool: eclipse(pattern: '**/target/compilelogs/*.xml'), qualityGates: [[threshold: 1, type: 'DELTA', unstable: false]]
-					recordIssues publishAllIssues:false, ignoreQualityGate:true, tool: javaDoc(), qualityGates: [[threshold: 1, type: 'DELTA', unstable: false]]
-					recordIssues publishAllIssues:false, ignoreQualityGate:true, tool: mavenConsole(), qualityGates: [[threshold: 1, type: 'DELTA_ERROR', unstable: false]]
+					recordIssues publishAllIssues:false, ignoreQualityGate:true, tool: eclipse(name: 'Compiler and API Tools', pattern: '**/target/compilelogs/*.xml'), qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]]
+					recordIssues publishAllIssues:false, ignoreQualityGate:true, tool: javaDoc(), qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]]
 				}
 			}
 		}

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

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.jdt.debug</artifactId>
     <groupId>eclipse.jdt.debug</groupId>
-    <version>4.31.0-SNAPSHOT</version>
+    <version>4.32.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.debug.jdi.tests</artifactId>

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

@@ -233,7 +233,7 @@ public void testJDIThreadGroup() {
 	}
 
 	/**
-	 * Test JDI addPlatformThreadsOnlyFilter() is skipped in old JDK version (<=18).
+	 * Test JDI addPlatformThreadsOnlyFilter() is skipped in old JDK version ({@code <=18}).
 	 */
 	public void testJDIPlatformThreadsOnlyFilter() {
 		// Make sure the entire VM is not suspended before we start a new thread

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.300.qualifier
+Bundle-Version: 3.12.400.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,7 @@ bin.includes = plugin.xml,\
                java8/,\
                java9/,\
                java16_/,\
-               java21/
+               java22/
 source.javadebugtests.jar = test plugin/,\
                             tests/,\
                             console tests/

org.eclipse.jdt.debug.tests/forceQualifierUpdate.txt

@@ -1,4 +1,6 @@
 # To force a version qualifier update, add the bug here
 Bug 530709 - Comparator errors in jdt debug and jdt ui in I20180204-2000
 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
-https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1781
+https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1923

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

@@ -14,22 +14,22 @@
   <parent>
     <artifactId>eclipse.jdt.debug</artifactId>
     <groupId>eclipse.jdt.debug</groupId>
-    <version>4.31.0-SNAPSHOT</version>
+    <version>4.32.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.debug.tests</artifactId>
-  <version>3.12.300-SNAPSHOT</version>
+  <version>3.12.400-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <testSuite>${project.artifactId}</testSuite>
     <testClass>org.eclipse.jdt.debug.tests.AutomatedSuite</testClass>
+  	<defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars>
   </properties>
   <build>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-surefire-plugin</artifactId>
-        <version>${tycho.version}</version>
         <configuration>
           <useUIHarness>true</useUIHarness>
           <useUIThread>true</useUIThread>

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2000, 2023 IBM Corporation and others.
+ *  Copyright (c) 2000, 2024 IBM Corporation and others.
  *
  *  This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License 2.0
@@ -65,6 +65,7 @@ public class JavaProjectHelper {
 	public static final String JAVA_SE_9_EE_NAME = "JavaSE-9";
 	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_22_EE_NAME = "JavaSE-22";
 
 	/**
 	 * path to the test src for 'testprograms'
@@ -95,6 +96,10 @@ public class JavaProjectHelper {
 	 * path to the 21 test source
 	 */
 	public static final IPath TEST_21_SRC_DIR = new Path("java21");
+	/**
+	 * path to the 22 test source
+	 */
+	public static final IPath TEST_22_SRC_DIR = new Path("java22");
 
 	/**
 	 * path to the compiler error java file
@@ -165,7 +170,7 @@ public static boolean isJava16_Compatible() {
 	public static boolean isJava19_Compatible() {
 		return isCompatible(19);
 	}
-	
+
 	/**
 	 * Returns if the currently running VM is version compatible with Java 21
 	 *
@@ -175,6 +180,15 @@ public static boolean isJava21_Compatible() {
 		return isCompatible(21);
 	}
 
+	/**
+	 * Returns if the currently running VM is version compatible with Java 22
+	 *
+	 * @return <code>true</code> if a Java 22 (or greater) VM is running <code>false</code> otherwise
+	 */
+	public static boolean isJava22_Compatible() {
+		return isCompatible(22);
+	}
+
 	/**
 	 * Returns if the current running system is compatible with the given Java minor version
 	 *