From aa25becc78890a94d1bc08e35b13aaf076d6a998 Mon Sep 17 00:00:00 2001 From: Jay Arthanareeswaran Date: Tue, 21 Jan 2025 11:55:11 +0530 Subject: [PATCH] Move the bundles that depend on jdt.debug to JavaSE-21 --- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../apt/pluggable/tests/PerformanceTests.java | 45 ++++++++++--------- org.eclipse.jdt.apt.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../eclipse/jdt/apt/tests/APTTestBase.java | 1 + .../org/eclipse/jdt/apt/tests/PerfTests.java | 4 +- org.eclipse.jdt.apt.ui/.classpath | 2 +- org.eclipse.jdt.apt.ui/.settings/.api_filters | 11 +++++ .../.settings/org.eclipse.jdt.core.prefs | 6 +-- org.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF | 4 +- org.eclipse.jdt.compiler.apt.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../compiler/apt/tests/FileManagerTests.java | 1 + .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jdt.core.tests.builder/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../core/tests/builder/AbstractLeakTest.java | 3 +- .../jdt/core/tests/builder/ErrorsTests.java | 4 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../tests/compiler/DeduplicationUtilTest.java | 1 + .../regression/AbstractRegressionTest.java | 15 +++---- .../regression/GenericTypeSignatureTest.java | 2 +- .../compiler/regression/JavadocTest.java | 2 +- org.eclipse.jdt.core.tests.model/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../tests/model/AbstractJavaModelTests.java | 1 + .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../performance/FullSourceWorkspaceTests.java | 4 +- 40 files changed, 102 insertions(+), 84 deletions(-) create mode 100644 org.eclipse.jdt.apt.ui/.settings/.api_filters diff --git a/org.eclipse.jdt.apt.pluggable.tests/.classpath b/org.eclipse.jdt.apt.pluggable.tests/.classpath index 427e49b0d47..c9bfedfe9ca 100644 --- a/org.eclipse.jdt.apt.pluggable.tests/.classpath +++ b/org.eclipse.jdt.apt.pluggable.tests/.classpath @@ -1,6 +1,6 @@ - + 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 index eba397dd20e..4d335724f38 100644 --- 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 index 3b5a7f5d844..9e39e7e43b8 100644 --- 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/org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/PerformanceTests.java b/org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/PerformanceTests.java index 872112cc99b..4a2eecebe53 100644 --- a/org.eclipse.jdt.apt.pluggable.tests/src/org/eclipse/jdt/apt/pluggable/tests/PerformanceTests.java +++ b/org.eclipse.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 index 1500a6b0f52..2cdee39702d 100644 --- a/org.eclipse.jdt.apt.tests/.classpath +++ b/org.eclipse.jdt.apt.tests/.classpath @@ -1,6 +1,6 @@ - + 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 index 40935403bc6..ed895a29fe7 100644 --- 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 index 7c3b0f08255..77a702e67a3 100644 --- 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 index afe34ce3ef0..6207c5b1d1b 100644 --- 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 index cc73ffbdb6b..80572bd6340 100644 --- 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 index 3628e336878..35386b94bbb 100644 --- a/org.eclipse.jdt.apt.ui/.classpath +++ b/org.eclipse.jdt.apt.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.jdt.apt.ui/.settings/.api_filters b/org.eclipse.jdt.apt.ui/.settings/.api_filters new file mode 100644 index 00000000000..a2aa8fdbab4 --- /dev/null +++ b/org.eclipse.jdt.apt.ui/.settings/.api_filters @@ -0,0 +1,11 @@ + + + + + + + + + + + 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 index 4682b4a98ce..5b2a390637f 100644 --- 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 index 82b3d8ae69b..35a0a298889 100644 --- 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 index ebb10abf9df..43f11cb5230 100644 --- a/org.eclipse.jdt.compiler.apt.tests/.classpath +++ b/org.eclipse.jdt.compiler.apt.tests/.classpath @@ -1,6 +1,6 @@ - + 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 index f853c3c908c..da33602239f 100644 --- 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 index 7cac8a55de0..0cfa3e722d0 100644 --- 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/org.eclipse.jdt.compiler.apt.tests/src/org/eclipse/jdt/compiler/apt/tests/FileManagerTests.java b/org.eclipse.jdt.compiler.apt.tests/src/org/eclipse/jdt/compiler/apt/tests/FileManagerTests.java index d17f5c5e9f8..7319f2ff00a 100644 --- a/org.eclipse.jdt.compiler.apt.tests/src/org/eclipse/jdt/compiler/apt/tests/FileManagerTests.java +++ b/org.eclipse.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 index 930780affd8..a1a671ee7af 100644 --- a/org.eclipse.jdt.compiler.tool.tests/.classpath +++ b/org.eclipse.jdt.compiler.tool.tests/.classpath @@ -1,6 +1,6 @@ - + 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 index c12bfebd098..f906f978f23 100644 --- 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 index c5f3056e24d..5c247ad4b37 100644 --- 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, diff --git a/org.eclipse.jdt.core.tests.builder/.classpath b/org.eclipse.jdt.core.tests.builder/.classpath index 427e49b0d47..c9bfedfe9ca 100644 --- a/org.eclipse.jdt.core.tests.builder/.classpath +++ b/org.eclipse.jdt.core.tests.builder/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.jdt.core.tests.builder/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.core.tests.builder/.settings/org.eclipse.jdt.core.prefs index 68f70ab61d7..ccfbba9c8a6 100644 --- a/org.eclipse.jdt.core.tests.builder/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jdt.core.tests.builder/.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 @@ -137,6 +137,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.core.tests.builder/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF index b9810e8569f..1580e991f2b 100644 --- a/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF @@ -16,6 +16,6 @@ Require-Bundle: org.junit;bundle-version="3.8.1", org.eclipse.test.performance;bundle-version="[3.1.0,4.0.0)", org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional, org.eclipse.jdt.apt.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Eclipse-BundleShape: dir Automatic-Module-Name: org.eclipse.jdt.core.tests.builder diff --git a/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/AbstractLeakTest.java b/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/AbstractLeakTest.java index ac77bf7edf8..6c2590f7eb3 100644 --- a/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/AbstractLeakTest.java +++ b/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/AbstractLeakTest.java @@ -179,6 +179,7 @@ private void checkOpenDescriptors(IFile file) throws Exception { } } + @SuppressWarnings("removal") private void runGcAndFInalization() { System.gc(); System.runFinalization(); @@ -230,7 +231,7 @@ private static int getPid() throws Exception { private static List readLsofLines(String cmd, boolean skipFirst) throws Exception { List lines = new ArrayList<>(); - Process process = Runtime.getRuntime().exec(cmd); + Process process = Runtime.getRuntime().exec(cmd.split("\\s")); try (BufferedReader rdr = new BufferedReader(new InputStreamReader(process.getInputStream()))) { if (skipFirst) { rdr.readLine(); diff --git a/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/ErrorsTests.java b/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/ErrorsTests.java index 573208511a8..82224319247 100644 --- a/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/ErrorsTests.java +++ b/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/ErrorsTests.java @@ -273,7 +273,7 @@ public void _test0105() throws JavaModelException, CoreException, IOException { // waiting for JDK 6: outputFolder.setWritable(true); -- workaround: Process process = null; try { - process = Runtime.getRuntime().exec("chmod -R a+w " + outputFolder.getAbsolutePath()); + process = Runtime.getRuntime().exec(new String[]{"chmod", "-R", "a+w", outputFolder.getAbsolutePath()}); process.waitFor(); } catch (InterruptedException e) { // go ahead @@ -289,7 +289,7 @@ public void _test0105() throws JavaModelException, CoreException, IOException { } catch (Throwable t) { Process process = null; try { - process = Runtime.getRuntime().exec("chmod -R a+w " + outputFolder.getAbsolutePath()); + process = Runtime.getRuntime().exec(new String[]{"chmod", "-R", "a+w", outputFolder.getAbsolutePath()}); process.waitFor(); } catch (InterruptedException ie) { // go ahead diff --git a/org.eclipse.jdt.core.tests.compiler/.classpath b/org.eclipse.jdt.core.tests.compiler/.classpath index 427e49b0d47..c9bfedfe9ca 100644 --- a/org.eclipse.jdt.core.tests.compiler/.classpath +++ b/org.eclipse.jdt.core.tests.compiler/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.jdt.core.tests.compiler/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.core.tests.compiler/.settings/org.eclipse.jdt.core.prefs index 7aa84ca07ac..4eacc6ee51a 100644 --- a/org.eclipse.jdt.core.tests.compiler/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jdt.core.tests.compiler/.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 @@ -137,6 +137,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.core.tests.compiler/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF index d29180e65b5..deb9b4aaeed 100644 --- a/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF @@ -25,7 +25,7 @@ Require-Bundle: org.junit;bundle-version="3.8.1", org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)", org.eclipse.jdt.internal.compiler.apt.dispatch -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Eclipse-BundleShape: dir Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jdt.core.tests.compiler diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/DeduplicationUtilTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/DeduplicationUtilTest.java index 0b9e729f45e..dfc236bd925 100644 --- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/DeduplicationUtilTest.java +++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/DeduplicationUtilTest.java @@ -179,6 +179,7 @@ private void assertDeduplicationList(Supplier> supplier) { } } + @SuppressWarnings("removal") private void forceGc() { System.gc(); System.runFinalization(); diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java index 77136a47fa2..a9202b97699 100644 --- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java +++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java @@ -225,8 +225,7 @@ static class JavacCompiler { this.compliance = CompilerOptions.versionToJdkLevel(this.version); this.minor = minorFromRawVersion(this.version, rawVersion); this.rawVersion = rawVersion; - StringBuilder classpathBuffer = new StringBuilder(" -classpath "); - this.classpath = classpathBuffer.toString(); + this.classpath = "-classpath "; } /** Call this if " -classpath " should be replaced by some other option token. */ protected void usePathOption(String option) { @@ -235,7 +234,7 @@ protected void usePathOption(String option) { static String getVersion(String javacPathName) throws IOException, InterruptedException { Process fetchVersionProcess = null; try { - fetchVersionProcess = Runtime.getRuntime().exec(javacPathName + " -version", env, null); + fetchVersionProcess = Runtime.getRuntime().exec(new String[] {javacPathName, "-version"}, env, null); Logger versionStdErrLogger = new Logger(fetchVersionProcess.getErrorStream(), ""); // for javac <= 1.8 Logger versionStdOutLogger = new Logger(fetchVersionProcess.getInputStream(), ""); // for javac >= 9 versionStdErrLogger.start(); @@ -605,7 +604,7 @@ long compile(File directory, String options, String[] sourceFileNames, StringBui } else { cmdLineAsString = cmdLine.toString(); } - compileProcess = Runtime.getRuntime().exec(cmdLineAsString, env, directory); + compileProcess = Runtime.getRuntime().exec(cmdLineAsString.split("\\s"), env, directory); Logger errorLogger = new Logger(compileProcess.getErrorStream(), "ERROR", log == null ? new StringBuilder() : log); errorLogger.start(); @@ -672,7 +671,7 @@ int execute(File directory, String options, String className, StringBuilder stdo cmdLine.append(options); cmdLine.append(' '); cmdLine.append(className); - executionProcess = Runtime.getRuntime().exec(cmdLine.toString(), env, directory); + executionProcess = Runtime.getRuntime().exec(cmdLine.toString().split("\\s"), env, directory); Logger outputLogger = new Logger(executionProcess.getInputStream(), "RUNTIME OUTPUT", stdout == null ? new StringBuilder() : stdout); outputLogger.start(); @@ -2333,7 +2332,7 @@ protected void runJavac( // Launch process compileProcess = Runtime.getRuntime().exec( - cmdLine.toString(), env, this.outputTestDirectory); + cmdLine.toString().split("\\s"), env, this.outputTestDirectory); // Log errors Logger errorLogger = new Logger(compileProcess.getErrorStream(), "ERROR"); @@ -2398,7 +2397,7 @@ protected void runJavac( javaCmdLine.append(cp); javaCmdLine.append(' ').append(testFiles[0].substring(0, testFiles[0].indexOf('.'))); // assume executable class is name of first test file - PREMATURE check if this is also the case in other test fwk classes - execProcess = Runtime.getRuntime().exec(javaCmdLine.toString(), env, this.outputTestDirectory); + execProcess = Runtime.getRuntime().exec(javaCmdLine.toString().split("\\s"), env, this.outputTestDirectory); Logger logger = new Logger(execProcess.getInputStream(), ""); // PREMATURE implement consistent error policy logger.start(); @@ -2487,7 +2486,7 @@ protected boolean runJavac(String options, String[] testFileNames, String curren // Launch process File currentDirectory = new File(currentDirectoryPath); compileProcess = Runtime.getRuntime().exec( - cmdLine.toString(), env, currentDirectory); + cmdLine.toString().split("\\s"), env, currentDirectory); // Log errors Logger errorLogger = new Logger(compileProcess.getErrorStream(), "ERROR"); diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeSignatureTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeSignatureTest.java index 2a71495eb5f..19f1d17c2b2 100644 --- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeSignatureTest.java +++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeSignatureTest.java @@ -157,7 +157,7 @@ protected void runJavac(final String testName, String[] testFiles) { cmdLineAsString = cmdLine.toString(); } // Launch process - process = Runtime.getRuntime().exec(cmdLineAsString, null, GenericTypeSignatureTest.this.dirPath.toFile()); + process = Runtime.getRuntime().exec(cmdLineAsString.split("\\s"), null, GenericTypeSignatureTest.this.dirPath.toFile()); // Log errors Logger errorLogger = new Logger(process.getErrorStream(), "ERROR"); diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest.java index b0d65c6c8b8..69e39204112 100644 --- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest.java +++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest.java @@ -514,7 +514,7 @@ protected void runJavac( // Launch process compileProcess = Runtime.getRuntime().exec( - cmdLine.toString(), null, this.outputTestDirectory); + cmdLine.toString().split("\\s"), null, this.outputTestDirectory); // Log errors Logger errorLogger = new Logger(compileProcess.getErrorStream(), "ERROR"); diff --git a/org.eclipse.jdt.core.tests.model/.classpath b/org.eclipse.jdt.core.tests.model/.classpath index 427e49b0d47..c9bfedfe9ca 100644 --- a/org.eclipse.jdt.core.tests.model/.classpath +++ b/org.eclipse.jdt.core.tests.model/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.jdt.core.tests.model/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.core.tests.model/.settings/org.eclipse.jdt.core.prefs index 7aa84ca07ac..4eacc6ee51a 100644 --- a/org.eclipse.jdt.core.tests.model/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jdt.core.tests.model/.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 @@ -137,6 +137,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.core.tests.model/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF index e0d235f146f..9d7813d9724 100644 --- a/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF @@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", com.ibm.icu;bundle-version="3.4.4", org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)", org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Eclipse-BundleShape: dir Bundle-Activator: org.eclipse.jdt.core.tests.Activator Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java index 716e31da649..fae387784d9 100644 --- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java +++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/AbstractJavaModelTests.java @@ -3748,6 +3748,7 @@ private static void printSystemEnv() { System.out.println(env); } + @SuppressWarnings("removal") private void printMemoryUse() { System.gc(); System.runFinalization(); diff --git a/org.eclipse.jdt.core.tests.performance/.classpath b/org.eclipse.jdt.core.tests.performance/.classpath index 427e49b0d47..c9bfedfe9ca 100644 --- a/org.eclipse.jdt.core.tests.performance/.classpath +++ b/org.eclipse.jdt.core.tests.performance/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.jdt.core.tests.performance/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.core.tests.performance/.settings/org.eclipse.jdt.core.prefs index c9bebd613e6..ea0ab5813f7 100644 --- a/org.eclipse.jdt.core.tests.performance/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jdt.core.tests.performance/.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 @@ -137,6 +137,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.core.tests.performance/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF index f621f5333e2..c37083a923c 100644 --- a/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF @@ -16,6 +16,6 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.20.100,4.0.0)", org.junit;bundle-version="3.8.1", org.eclipse.test.performance;bundle-version="[3.20.0,4.0.0)", org.eclipse.text;bundle-version="[3.13.0,4.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Eclipse-BundleShape: dir Automatic-Module-Name: org.eclipse.jdt.core.tests.performance diff --git a/org.eclipse.jdt.core.tests.performance/src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceTests.java b/org.eclipse.jdt.core.tests.performance/src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceTests.java index 5320179d157..c2dc6eaec00 100644 --- a/org.eclipse.jdt.core.tests.performance/src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceTests.java +++ b/org.eclipse.jdt.core.tests.performance/src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceTests.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.io.PrintStream; import java.net.MalformedURLException; -import java.net.URL; +import java.net.URI; import java.nio.file.Files; import java.nio.file.StandardCopyOption; import java.text.DateFormat; @@ -419,7 +419,7 @@ public static File fetchFromBinariesProject(String nameInProject, long size) thr 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); } }