From ee53d4ce6dfd76f3635ffc9b79acc5ea2f39e0c2 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Wed, 20 Nov 2024 09:52:39 +0100 Subject: [PATCH 1/2] Adds forRemoval to long deprecated methods in Platform Mark long time deprecated constants and methods for removal so that we have the option to remove them after the deprecation period ends. This is planned to be merged beginning of the 2025-03 release. --- .../org/eclipse/core/runtime/Platform.java | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java b/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java index 1b5c83f271d..65bd5f2ac11 100644 --- a/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java +++ b/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java @@ -272,7 +272,7 @@ public static boolean isMac() { * @since 3.0 * @deprecated not supported anymore */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static final String OS_AIX = "aix";//$NON-NLS-1$ /** @@ -287,7 +287,7 @@ public static boolean isMac() { * * @deprecated not supported anymore */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static final String OS_SOLARIS = "solaris";//$NON-NLS-1$ /** @@ -302,7 +302,7 @@ public static boolean isMac() { * * @deprecated not supported anymore */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static final String OS_HPUX = "hpux";//$NON-NLS-1$ /** @@ -317,7 +317,7 @@ public static boolean isMac() { * * @deprecated not supported anymore */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static final String OS_QNX = "qnx";//$NON-NLS-1$ /** @@ -355,7 +355,7 @@ public static boolean isMac() { * @since 3.0 * @deprecated not supported anymore */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static final String ARCH_X86 = "x86";//$NON-NLS-1$ /** @@ -370,7 +370,7 @@ public static boolean isMac() { * * @deprecated not supported anymore */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static final String ARCH_PA_RISC = "PA_RISC";//$NON-NLS-1$ /** @@ -385,7 +385,7 @@ public static boolean isMac() { * * @deprecated not supported anymore */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static final String ARCH_PPC = "ppc";//$NON-NLS-1$ /** @@ -400,7 +400,7 @@ public static boolean isMac() { * * @deprecated not supported anymore */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static final String ARCH_SPARC = "sparc";//$NON-NLS-1$ /** @@ -455,7 +455,7 @@ public static boolean isMac() { * * @deprecated not supported anymore */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static final String ARCH_IA64 = "ia64"; //$NON-NLS-1$ /** @@ -493,7 +493,7 @@ public static boolean isMac() { * * @deprecated not supported anymore */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static final String WS_MOTIF = "motif";//$NON-NLS-1$ /** @@ -519,7 +519,7 @@ public static boolean isMac() { * @since 3.0 * @deprecated not supported anymore */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static final String WS_PHOTON = "photon";//$NON-NLS-1$ /** @@ -534,7 +534,7 @@ public static boolean isMac() { * * @since 3.0 */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static final String WS_CARBON = "carbon";//$NON-NLS-1$ /** @@ -552,7 +552,7 @@ public static boolean isMac() { * @since 3.3 * @deprecated not supported anymore */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static final String WS_WPF = "wpf";//$NON-NLS-1$ /** @@ -671,7 +671,7 @@ public static void addProtectionSpace(URL resourceUrl, String realm) throws Core * @see Bundle#getEntry(String) * @deprecated use {@link FileLocator#toFileURL(URL)} instead */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static URL asLocalURL(URL url) throws IOException { return FileLocator.toFileURL(url); } @@ -680,7 +680,7 @@ public static URL asLocalURL(URL url) throws IOException { * Takes down the splash screen if one was put up. * @deprecated use {@link IApplicationContext#applicationRunning()} instead */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static void endSplash() { InternalPlatform.getDefault().endSplash(); } @@ -810,7 +810,7 @@ public static IPath getLogFileLocation() { * As the org.eclipse.core.runtime.compatibility plug-in has been removed in * Eclipse 4.6 this method is not supported anymore. */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static Plugin getPlugin(String id) { return null; } @@ -851,7 +851,7 @@ public static void removeLogListener(ILogListener listener) { * @see Bundle#getEntry(String) * @deprecated use {@link FileLocator#resolve(URL)} instead */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static URL resolve(URL url) throws IOException { return FileLocator.resolve(url); } @@ -864,7 +864,7 @@ public static URL resolve(URL url) throws IOException { * @param runnable the runnable to run * @deprecated clients should use SafeRunner#run instead */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static void run(ISafeRunnable runnable) { SafeRunner.run(runnable); } @@ -897,7 +897,7 @@ public static IExtensionRegistry getExtensionRegistry() { * @since 3.0 * @deprecated use {@link FileLocator#find(Bundle, IPath)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static URL find(Bundle bundle, IPath path) { return FileLocator.find(bundle, path); } @@ -959,7 +959,7 @@ public static URL find(Bundle bundle, IPath path) { * @since 3.0 * @deprecated use {@link FileLocator#find(Bundle, IPath, Map)} instead */ - @Deprecated + @Deprecated(forRemoval = true, since = "2025-03") public static URL find(Bundle bundle, IPath path, Map override) { return FileLocator.find(bundle, path, override); } @@ -1219,7 +1219,7 @@ public static String[] getApplicationArgs() { * clients, see javadoc for details. * @since 3.0 */ - @Deprecated(forRemoval = true) + @Deprecated(forRemoval = true, since = "2024-03") // 2024-03 was added later for information purposes public static PlatformAdmin getPlatformAdmin() { return InternalPlatform.getDefault().getPlatformAdmin(); } From 17812edd26d95f7c2577c59e025bd36e1f59c1a9 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Wed, 27 Nov 2024 22:41:44 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.35 stream --- runtime/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF b/runtime/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF index e23c69f6a9d..1ef4c9aa7d3 100644 --- a/runtime/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF +++ b/runtime/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-Version: 3.32.0.qualifier +Bundle-Version: 3.32.100.qualifier Bundle-SymbolicName: org.eclipse.core.runtime; singleton:=true Bundle-Vendor: %providerName Bundle-Activator: org.eclipse.core.internal.runtime.PlatformActivator