From a052d4a1879dc28988a923f5eecc09a650bba1ea Mon Sep 17 00:00:00 2001 From: Noopur Gupta Date: Fri, 19 Jan 2024 12:53:16 +0530 Subject: [PATCH 1/4] [22] Run Gerrit builds for JDT Debug BETA_JAVA22 branch with latest Y-build https://github.com/eclipse-jdt/eclipse.jdt.debug/issues/377 --- pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9d68df01d4..c15042468d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ @@ -383,6 +388,11 @@ id="JavaSE-21" compliance="21"> + + From f22b351c529c2eea093b8fe05737f97a5d6eaade Mon Sep 17 00:00:00 2001 From: Noopur Gupta Date: Wed, 20 Mar 2024 08:33:37 +0530 Subject: [PATCH 3/4] [22] Remove Beta Disclaimers in Java 22 in JDT Debug (#408) https://github.com/eclipse-jdt/eclipse.jdt.core/issues/2164 --- .../jdt/internal/launching/EECompilationParticipant.java | 4 ---- .../org/eclipse/jdt/internal/launching/StandardVMType.java | 6 +----- .../launching/environments/EnvironmentsManager.java | 4 ---- .../environments/ExecutionEnvironmentAnalyzer.java | 4 ---- .../launching/org/eclipse/jdt/launching/JavaRuntime.java | 4 ---- org.eclipse.jdt.launching/plugin.properties | 4 ---- org.eclipse.jdt.launching/plugin.xml | 5 ----- 7 files changed, 1 insertion(+), 30 deletions(-) diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java index 1c7933344a..b0d224f386 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java @@ -8,10 +8,6 @@ * * SPDX-License-Identifier: EPL-2.0 * - * This is an implementation of an early-draft specification developed under the Java - * Community Process (JCP) and is made available for testing and evaluation purposes - * only. The code is not compatible with any specification of the JCP. - * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java index d9a61f0c37..2bfb03a564 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java @@ -8,10 +8,6 @@ * * SPDX-License-Identifier: EPL-2.0 * - * This is an implementation of an early-draft specification developed under the Java - * Community Process (JCP) and is made available for testing and evaluation purposes - * only. The code is not compatible with any specification of the JCP. - * * Contributors: * IBM Corporation - initial API and implementation * Michael Allman - Bug 211648, Bug 156343 - Standard VM not supported on MacOS @@ -851,7 +847,7 @@ public static URL getDefaultJavadocLocation(String version) { try { if (version.startsWith(JavaCore.VERSION_22)) { // To modify to version 22 after the release - return new URL("https://docs.oracle.com/en/java/javase/21/docs/api/"); //$NON-NLS-1$ + return new URL("https://docs.oracle.com/en/java/javase/22/docs/api/"); //$NON-NLS-1$ } else if (version.startsWith(JavaCore.VERSION_21)) { return new URL("https://docs.oracle.com/en/java/javase/21/docs/api/"); //$NON-NLS-1$ } else if (version.startsWith(JavaCore.VERSION_20)) { diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java index 94dfb44205..76dacb65b4 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java @@ -8,10 +8,6 @@ * * SPDX-License-Identifier: EPL-2.0 * - * This is an implementation of an early-draft specification developed under the Java - * Community Process (JCP) and is made available for testing and evaluation purposes - * only. The code is not compatible with any specification of the JCP. - * * Contributors: * IBM Corporation - initial API and implementation * diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentAnalyzer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentAnalyzer.java index 98948eb6b1..5c1d921c01 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentAnalyzer.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentAnalyzer.java @@ -8,10 +8,6 @@ * * SPDX-License-Identifier: EPL-2.0 * - * This is an implementation of an early-draft specification developed under the Java - * Community Process (JCP) and is made available for testing and evaluation purposes - * only. The code is not compatible with any specification of the JCP. - * * Contributors: * IBM Corporation - initial API and implementation * diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java index e89ba6b65d..42cabe2ca6 100644 --- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java +++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java @@ -8,10 +8,6 @@ * * SPDX-License-Identifier: EPL-2.0 * - * This is an implementation of an early-draft specification developed under the Java - * Community Process (JCP) and is made available for testing and evaluation purposes - * only. The code is not compatible with any specification of the JCP. - * * Contributors: * IBM Corporation - initial API and implementation * Frits Jalvingh - Contribution for Bug 459831 - [launching] Support attaching diff --git a/org.eclipse.jdt.launching/plugin.properties b/org.eclipse.jdt.launching/plugin.properties index f2422816ba..5874f418fa 100644 --- a/org.eclipse.jdt.launching/plugin.properties +++ b/org.eclipse.jdt.launching/plugin.properties @@ -8,10 +8,6 @@ # # SPDX-License-Identifier: EPL-2.0 # -# This is an implementation of an early-draft specification developed under the Java -# Community Process (JCP) and is made available for testing and evaluation purposes -# only. The code is not compatible with any specification of the JCP. -# # Contributors: # IBM Corporation - initial API and implementation ############################################################################### diff --git a/org.eclipse.jdt.launching/plugin.xml b/org.eclipse.jdt.launching/plugin.xml index d5e12eb356..a3579476b6 100644 --- a/org.eclipse.jdt.launching/plugin.xml +++ b/org.eclipse.jdt.launching/plugin.xml @@ -10,11 +10,6 @@ SPDX-License-Identifier: EPL-2.0 - - This is an implementation of an early-draft specification developed under the Java - Community Process (JCP) and is made available for testing and evaluation purposes - only. The code is not compatible with any specification of the JCP. - Contributors: IBM Corporation - initial API and implementation --> From 2b75095bfc3e37bd385286d99764d891e7deada8 Mon Sep 17 00:00:00 2001 From: Jay Arthanareeswaran Date: Wed, 20 Mar 2024 10:42:28 +0530 Subject: [PATCH 4/4] Update bundle versions for the modified bundles for Java22 --- org.eclipse.jdt.launching/META-INF/MANIFEST.MF | 2 +- org.eclipse.jdt.launching/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF index d6d8240993..1d280a2ebf 100644 --- a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.launching; singleton:=true -Bundle-Version: 3.21.100.qualifier +Bundle-Version: 3.21.150.qualifier Bundle-Activator: org.eclipse.jdt.internal.launching.LaunchingPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/org.eclipse.jdt.launching/pom.xml b/org.eclipse.jdt.launching/pom.xml index 82b7bc5563..ace1a78c9c 100644 --- a/org.eclipse.jdt.launching/pom.xml +++ b/org.eclipse.jdt.launching/pom.xml @@ -1,6 +1,6 @@