Merge remote-tracking branch 'origin/master' into BETA_JAVA24

mpalat · Jan 31, 2025 · df5ce25 · df5ce25
2 parents 0ab5697 + f29e440
commit df5ce25
Show file tree

Hide file tree

Showing 142 changed files with 2,245 additions and 24,531 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Upload
-      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
       with:
         name: Event File
         path: ${{ github.event_path }}
@@ -46,7 +46,7 @@ jobs:
         mvn -U clean verify --batch-mode --fail-at-end -Ptest-on-javase-21 -Pbree-libs -Papi-check -Djava.io.tmpdir=$WORKSPACE/tmp -Dproject.build.sourceEncoding=UTF-8 -Dtycho.surefire.argLine="--add-modules ALL-SYSTEM -Dcompliance=1.8,11,17,20 -Djdt.performance.asserts=disabled" -Dcbi-ecj-version=99.99
     - name: Upload Test Results for Linux
       if: always()
-      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
       with:
         name: test-results-linux
         if-no-files-found: warn

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -39,6 +39,7 @@ pipeline {
 						-DDetectVMInstallationsJob.disabled=true \
 						-Dtycho.apitools.debug \
 						-Dtycho.debug.artifactcomparator \
+						-e \
 						-Dcbi-ecj-version=99.99
 					"""
 			}

diff --git a/org.eclipse.jdt.apt.pluggable.tests/.classpath b/org.eclipse.jdt.apt.pluggable.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

diff --git a/org.eclipse.jdt.apt.pluggable.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.apt.pluggable.tests/.settings/org.eclipse.jdt.core.prefs
@@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -124,6 +124,6 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF
@@ -17,6 +17,6 @@ Require-Bundle: org.junit,
  org.eclipse.ui.ide
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Eclipse-BundleShape: dir
 Automatic-Module-Name: org.eclipse.jdt.apt.pluggable.tests
diff --git a/...pse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/PerformanceTests.java b/...pse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/PerformanceTests.java
@@ -35,11 +35,14 @@ public class PerformanceTests extends TestBase
 	private final static int PAUSE_TIME = 2000; // milliseconds to wait for indexer
 	private final static boolean INCLUDE_APT_DISABLED = true;
 
-	private final static String CMD_PROFILER_PREFIX = "java -jar c:/opt/yourkit-8.0.13/lib/yjp-controller-api-redist.jar localhost 10001";
-	private final static String CMD_START_CPU_PROFILING = CMD_PROFILER_PREFIX + " start-cpu-sampling noj2ee";
-	private final static String CMD_STOP_CPU_PROFILING =  CMD_PROFILER_PREFIX + " stop-cpu-profiling";
-	private final static String CMD_PERF_SNAPSHOT =       CMD_PROFILER_PREFIX + " capture-performance-snapshot";
-	private final static String CMD_HEAP_SNAPSHOT =       CMD_PROFILER_PREFIX + " capture-memory-snapshot";
+	private final static String JAVA = "java";
+	private final static String JAR = "-jar";
+	private final static String YOURKIT_CMD = "c:/opt/yourkit-8.0.13/lib/yjp-controller-api-redist.jar localhost 10001";
+
+	private final static String[] CMD_START_CPU_PROFILING_AS_ARRAY = new String[]{JAVA, JAR, YOURKIT_CMD, "start-cpu-sampling noj2ee"};
+	private final static String[] CMD_STOP_CPU_PROFILING_AS_ARRAY =  new String[]{JAVA, JAR, YOURKIT_CMD, "stop-cpu-profiling"};
+	private final static String[] CMD_PERF_SNAPSHOT_AS_ARRAY = new String[]{JAVA, JAR, YOURKIT_CMD, "capture-performance-snapshot"};
+	private final static String[] CMD_HEAP_SNAPSHOT_AS_ARRAY = new String[]{JAVA, JAR, YOURKIT_CMD, "capture-memory-snapshot"};
 
 	public PerformanceTests(String name) {
 		super(name);
@@ -158,14 +161,14 @@ public void testBoringFiles() throws Exception
 		if (INCLUDE_APT_DISABLED) {
 			AptConfig.setEnabled(jproj, false);
 			startNanos = System.nanoTime();
-			run.exec(CMD_START_CPU_PROFILING).waitFor();
+			run.exec(CMD_START_CPU_PROFILING_AS_ARRAY).waitFor();
 			fullBuild( project.getFullPath() );
 			if (VERBOSE) {
 				System.out
 						.println("APT disabled: full build took " + ((System.nanoTime() - startNanos) / 1_000_000L) + " ms");
 			}
-			run.exec(CMD_PERF_SNAPSHOT).waitFor();
-			run.exec(CMD_STOP_CPU_PROFILING).waitFor();
+			run.exec(CMD_PERF_SNAPSHOT_AS_ARRAY).waitFor();
+			run.exec(CMD_STOP_CPU_PROFILING_AS_ARRAY).waitFor();
 			expectingNoProblems();
 		}
 
@@ -181,7 +184,7 @@ public void testBoringFiles() throws Exception
 			System.out.println("full build took " + ((System.nanoTime() - startNanos) / 1_000_000L) + " ms");
 			System.out.println("Taking heap snapshot");
 		}
-		run.exec(CMD_HEAP_SNAPSHOT).waitFor();
+		run.exec(CMD_HEAP_SNAPSHOT_AS_ARRAY).waitFor();
 		expectingNoProblems();
 
 		System.gc();
@@ -191,13 +194,13 @@ public void testBoringFiles() throws Exception
 		startNanos = System.nanoTime();
 		if (VERBOSE)
 			System.out.println("APT enabled: starting full build");
-		run.exec(CMD_START_CPU_PROFILING).waitFor();
+		run.exec(CMD_START_CPU_PROFILING_AS_ARRAY).waitFor();
 		fullBuild( project.getFullPath() );
 		if (VERBOSE) {
 			System.out.println("full build took " + ((System.nanoTime() - startNanos) / 1_000_000L) + " ms");
 		}
-		run.exec(CMD_PERF_SNAPSHOT).waitFor();
-		run.exec(CMD_STOP_CPU_PROFILING).waitFor();
+		run.exec(CMD_PERF_SNAPSHOT_AS_ARRAY).waitFor();
+		run.exec(CMD_STOP_CPU_PROFILING_AS_ARRAY).waitFor();
 		expectingNoProblems();
 
 		System.gc();
@@ -207,13 +210,13 @@ public void testBoringFiles() throws Exception
 		startNanos = System.nanoTime();
 		if (VERBOSE)
 			System.out.println("APT enabled: starting full build");
-		run.exec(CMD_START_CPU_PROFILING).waitFor();
+		run.exec(CMD_START_CPU_PROFILING_AS_ARRAY).waitFor();
 		fullBuild( project.getFullPath() );
 		if (VERBOSE) {
 			System.out.println("full build took " + ((System.nanoTime() - startNanos) / 1_000_000L) + " ms");
 		}
-		run.exec(CMD_PERF_SNAPSHOT).waitFor();
-		run.exec(CMD_STOP_CPU_PROFILING).waitFor();
+		run.exec(CMD_PERF_SNAPSHOT_AS_ARRAY).waitFor();
+		run.exec(CMD_STOP_CPU_PROFILING_AS_ARRAY).waitFor();
 		expectingNoProblems();
 
 		// Now delete the project!
@@ -241,13 +244,13 @@ public void _testInterestingFilesWithJ6() throws Exception
 		if (INCLUDE_APT_DISABLED) {
 			AptConfig.setEnabled(jproj, false);
 			long startNanos = System.nanoTime();
-			run.exec(CMD_START_CPU_PROFILING).waitFor();
+			run.exec(CMD_START_CPU_PROFILING_AS_ARRAY).waitFor();
 			fullBuild( project.getFullPath() );
 			if (VERBOSE)
 				System.out.println(
 						"APT disabled: full build took " + ((System.nanoTime() - startNanos) / 1_000_000L) + " ms");
-			run.exec(CMD_PERF_SNAPSHOT).waitFor();
-			run.exec(CMD_STOP_CPU_PROFILING).waitFor();
+			run.exec(CMD_PERF_SNAPSHOT_AS_ARRAY).waitFor();
+			run.exec(CMD_STOP_CPU_PROFILING_AS_ARRAY).waitFor();
 			expectingNoProblems();
 		}
 
@@ -258,12 +261,12 @@ public void _testInterestingFilesWithJ6() throws Exception
 		long startNanos = System.nanoTime();
 		if (VERBOSE)
 			System.out.println("APT enabled: starting full build");
-		run.exec(CMD_START_CPU_PROFILING).waitFor();
+		run.exec(CMD_START_CPU_PROFILING_AS_ARRAY).waitFor();
 		fullBuild( project.getFullPath() );
 		if (VERBOSE)
 			System.out.println("full build took " + ((System.nanoTime() - startNanos) / 1_000_000L) + " ms");
-		run.exec(CMD_PERF_SNAPSHOT).waitFor();
-		run.exec(CMD_STOP_CPU_PROFILING).waitFor();
+		run.exec(CMD_PERF_SNAPSHOT_AS_ARRAY).waitFor();
+		run.exec(CMD_STOP_CPU_PROFILING_AS_ARRAY).waitFor();
 		expectingNoProblems();
 
 		// Now delete the project!

diff --git a/org.eclipse.jdt.apt.tests/.classpath b/org.eclipse.jdt.apt.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

diff --git a/org.eclipse.jdt.apt.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.apt.tests/.settings/org.eclipse.jdt.core.prefs
@@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -124,6 +124,6 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF
@@ -41,7 +41,7 @@ Require-Bundle: org.junit,
  org.eclipse.core.runtime,
  org.eclipse.test.performance
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Vendor: %providerName
 Eclipse-BundleShape: dir
 Automatic-Module-Name: org.eclipse.jdt.apt.tests
diff --git a/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/APTTestBase.java b/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/APTTestBase.java
@@ -125,6 +125,7 @@ protected void tearDown()
 		super.tearDown();
 	}
 
+	@SuppressWarnings("removal")
 	private static void runFinalizers() {
         // GC in an attempt to release file lock on Classes.jar
 		System.gc();

diff --git a/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/PerfTests.java b/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/PerfTests.java
@@ -21,7 +21,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import java.util.zip.ZipInputStream;
@@ -89,7 +89,7 @@ private static File fetchFromBinariesProject(String nameInProject, long size) th
 		File tempFile = new File(tmpRoot, nameInProject);
 		if (!tempFile.isFile() || tempFile.length() != size) {			
 			String githubUrl = GITHUB_TESTS_BINARIES + nameInProject;
-			try(BufferedInputStream bin = new BufferedInputStream(new URL(githubUrl).openStream())){
+			try(BufferedInputStream bin = new BufferedInputStream(URI.create(githubUrl).toURL().openStream())){
 				Files.copy(bin, tempFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
 			}
 		}

diff --git a/org.eclipse.jdt.apt.ui/.classpath b/org.eclipse.jdt.apt.ui/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

diff --git a/org.eclipse.jdt.apt.ui/.settings/.api_filters b/org.eclipse.jdt.apt.ui/.settings/.api_filters
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.jdt.apt.ui" version="2">
+    <resource path="META-INF/MANIFEST.MF">
+        <filter id="930086955">
+            <message_arguments>
+                <message_argument value="3.8.600"/>
+                <message_argument value="3.8.500"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/org.eclipse.jdt.apt.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.apt.ui/.settings/org.eclipse.jdt.core.prefs
@@ -15,9 +15,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -123,6 +123,6 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/org.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF b/org.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.apt.ui; singleton:=true
-Bundle-Version: 3.8.500.qualifier
+Bundle-Version: 3.8.600.qualifier
 Bundle-Activator: org.eclipse.jdt.apt.ui.internal.AptUIPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.jdt.apt.core;bundle-version="[3.6.0,4.0.0)",
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.jdt.apt.core;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: org.eclipse.jdt.apt.ui.internal;x-internal:=true,
  org.eclipse.jdt.apt.ui.internal.preferences;x-internal:=true,
  org.eclipse.jdt.apt.ui.internal.util;x-internal:=true

diff --git a/org.eclipse.jdt.compiler.apt.tests/.classpath b/org.eclipse.jdt.compiler.apt.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="module" value="true"/>
 			<attribute name="limit-modules" value="java.xml"/>

diff --git a/org.eclipse.jdt.compiler.apt.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.compiler.apt.tests/.settings/org.eclipse.jdt.core.prefs
@@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -124,6 +124,6 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.jdt.compiler.apt.tests;singleton:=true
 Bundle-Version: 1.3.700.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.junit,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,

diff --git a/...lipse.jdt.compiler.apt.tests/src/org/eclipse/jdt/compiler/apt/tests/FileManagerTests.java b/...lipse.jdt.compiler.apt.tests/src/org/eclipse/jdt/compiler/apt/tests/FileManagerTests.java
@@ -225,6 +225,7 @@ public void testBug514121_getClassloader_close() throws Exception {
 		assertNull(loader.findResource("jarresource.txt")); // assert the classloader is closed
 	}
 
+	@SuppressWarnings("removal")
 	public void testBug573287_ArchiveFileObject_openInputStream() throws Exception {
 		Path dir = Files.createTempDirectory("repro573287-");
 		Path target = dir.resolve("copy573287.zip");

diff --git a/org.eclipse.jdt.compiler.tool.tests/.classpath b/org.eclipse.jdt.compiler.tool.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="module" value="true"/>
 			<attribute name="limit-modules" value="java.xml,java.logging"/>

diff --git a/org.eclipse.jdt.compiler.tool.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.compiler.tool.tests/.settings/org.eclipse.jdt.core.prefs
@@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -124,6 +124,6 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.jdt.compiler.tool.tests
 Bundle-Version: 1.4.700.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.40.0,4.0.0)",
  org.junit,
  org.eclipse.core.resources,