From d99d06cecad52476e64dc6849b30ba222baa9c37 Mon Sep 17 00:00:00 2001 From: jantje Date: Sat, 13 Jun 2020 13:15:30 -0400 Subject: [PATCH] Bug 564123: Remove deprecated method from EnvironmentReader EnvironmentReader.getRawEnvVars has a better replacement, EnvironmentReader.getEnvVars Change-Id: I91b209f3f601b748dd5d635ff44a36765d519e49 Signed-off-by: jantje --- .../META-INF/MANIFEST.MF | 4 ++-- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../org.eclipse.cdt.core.linux.x86_64/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- core/org.eclipse.cdt.core.linux/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- core/org.eclipse.cdt.core.macosx/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../cdt/utils/spawner/EnvironmentReader.java | 9 -------- .../META-INF/MANIFEST.MF | 4 ++-- .../org.eclipse.cdt.core.win32.x86_64/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- core/org.eclipse.cdt.core.win32/pom.xml | 2 +- .../org.eclipse.cdt.core/META-INF/MANIFEST.MF | 2 +- .../guide/deprecated_API_removals.html | 22 ++++++++++++++----- .../META-INF/MANIFEST.MF | 4 ++-- 17 files changed, 38 insertions(+), 37 deletions(-) diff --git a/core/org.eclipse.cdt.core.linux.ppc64le/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.ppc64le/META-INF/MANIFEST.MF index 8b9fa2352fb..7586bdce61d 100644 --- a/core/org.eclipse.cdt.core.linux.ppc64le/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.linux.ppc64le/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-SymbolicName: org.eclipse.cdt.core.linux.ppc64le;singleton:=true Bundle-ManifestVersion: 2 Bundle-Localization: plugin Bundle-Name: %fragmentName.linux.ppc64le -Bundle-Version: 1.0.100.qualifier -Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" +Bundle-Version: 6.0.0.qualifier +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[6.0.0,7.0.0)" Bundle-Vendor: %providerName Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=ppc64le)) diff --git a/core/org.eclipse.cdt.core.linux.ppc64le/pom.xml b/core/org.eclipse.cdt.core.linux.ppc64le/pom.xml index 3f5b67e6ca2..d0732049018 100644 --- a/core/org.eclipse.cdt.core.linux.ppc64le/pom.xml +++ b/core/org.eclipse.cdt.core.linux.ppc64le/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 1.0.100-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.cdt.core.linux.ppc64le eclipse-plugin diff --git a/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF index 53e2dd9e50d..14eabee4ac0 100644 --- a/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %fragmentName.linux.x86_64 Bundle-SymbolicName: org.eclipse.cdt.core.linux.x86_64;singleton:=true -Bundle-Version: 5.3.100.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[6.0.0,7.0.0)" Bundle-Localization: plugin Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=x86_64)) diff --git a/core/org.eclipse.cdt.core.linux.x86_64/pom.xml b/core/org.eclipse.cdt.core.linux.x86_64/pom.xml index 59bd602b59e..f525efb4fff 100644 --- a/core/org.eclipse.cdt.core.linux.x86_64/pom.xml +++ b/core/org.eclipse.cdt.core.linux.x86_64/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 5.3.100-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.cdt.core.linux.x86_64 eclipse-plugin diff --git a/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF index a76609869c0..c7f4b92d61e 100644 --- a/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %fragmentName.linux Bundle-SymbolicName: org.eclipse.cdt.core.linux; singleton:=true -Bundle-Version: 5.3.100.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[6.0.0,7.0.0)" Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Eclipse-PlatformFilter: (osgi.os=linux) diff --git a/core/org.eclipse.cdt.core.linux/pom.xml b/core/org.eclipse.cdt.core.linux/pom.xml index 1421c0c7cc6..eacc249a446 100644 --- a/core/org.eclipse.cdt.core.linux/pom.xml +++ b/core/org.eclipse.cdt.core.linux/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 5.3.100-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.cdt.core.linux eclipse-plugin diff --git a/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF index 36b40a4f96f..83f776ca07f 100644 --- a/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %fragmentName.macosx Bundle-SymbolicName: org.eclipse.cdt.core.macosx; singleton:=true -Bundle-Version: 5.3.1.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[6.0.0,7.0.0)" Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Eclipse-PlatformFilter: (osgi.os=macosx) diff --git a/core/org.eclipse.cdt.core.macosx/pom.xml b/core/org.eclipse.cdt.core.macosx/pom.xml index 10084c9b47f..2814786462c 100644 --- a/core/org.eclipse.cdt.core.macosx/pom.xml +++ b/core/org.eclipse.cdt.core.macosx/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 5.3.1-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.cdt.core.macosx eclipse-plugin diff --git a/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF index c7acc219d5e..cc54abd8c9f 100644 --- a/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.core.native;singleton:=true -Bundle-Version: 5.10.400.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Activator: org.eclipse.cdt.internal.core.natives.CNativePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/EnvironmentReader.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/EnvironmentReader.java index 6e0adcf8a8f..baad1b49302 100644 --- a/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/EnvironmentReader.java +++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/EnvironmentReader.java @@ -69,13 +69,4 @@ public class EnvironmentReader { init(); return envVarsNormalized.getProperty(key); } - - /** - * @deprecated since CDT 6.1. {@link #getEnvVars()} provides all the data. - */ - @Deprecated - public static String[] getRawEnvVars() { - init(); - return rawVars.toArray(new String[rawVars.size()]); - } } diff --git a/core/org.eclipse.cdt.core.win32.x86_64/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.win32.x86_64/META-INF/MANIFEST.MF index ae8a5a50f50..8529f94bd49 100644 --- a/core/org.eclipse.cdt.core.win32.x86_64/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.win32.x86_64/META-INF/MANIFEST.MF @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %fragmentName.win32.x86_64 Bundle-SymbolicName: org.eclipse.cdt.core.win32.x86_64;singleton:=true -Bundle-Version: 5.4.100.qualifier -Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" +Bundle-Version: 6.0.0.qualifier +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[6.0.0,7.0.0)" Eclipse-PlatformFilter: (&(osgi.os=win32)(osgi.arch=x86_64)) Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/core/org.eclipse.cdt.core.win32.x86_64/pom.xml b/core/org.eclipse.cdt.core.win32.x86_64/pom.xml index e5414e23207..ace69533697 100644 --- a/core/org.eclipse.cdt.core.win32.x86_64/pom.xml +++ b/core/org.eclipse.cdt.core.win32.x86_64/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 5.4.100-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.cdt.core.win32.x86_64 eclipse-plugin diff --git a/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF index 66e99f68c87..c7552b26a3e 100644 --- a/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %fragmentName.win32 Bundle-SymbolicName: org.eclipse.cdt.core.win32; singleton:=true -Bundle-Version: 5.4.2.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Vendor: %providerName -Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[5.7.0,6.0.0)" +Fragment-Host: org.eclipse.cdt.core.native;bundle-version="[6.0.0,7.0.0)" Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Eclipse-PlatformFilter: (osgi.os=win32) diff --git a/core/org.eclipse.cdt.core.win32/pom.xml b/core/org.eclipse.cdt.core.win32/pom.xml index 3e38095203b..ea1183095c0 100644 --- a/core/org.eclipse.cdt.core.win32/pom.xml +++ b/core/org.eclipse.cdt.core.win32/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 5.4.2-SNAPSHOT + 6.0.0-SNAPSHOT org.eclipse.cdt.core.win32 eclipse-plugin diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF index 12f5883210d..a8f9220392f 100644 --- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF @@ -122,7 +122,7 @@ Export-Package: org.eclipse.cdt.core, org.eclipse.cdt.utils.som.parser, org.eclipse.cdt.utils.xcoff, org.eclipse.cdt.utils.xcoff.parser -Require-Bundle: org.eclipse.cdt.core.native;bundle-version="[5.10.100,6.0.0)";visibility:=reexport, +Require-Bundle: org.eclipse.cdt.core.native;bundle-version="[6.0.0,7.0.0)";visibility:=reexport, org.eclipse.core.contenttype;bundle-version="[3.7.400,4.0.0)", org.eclipse.core.expressions;bundle-version="[3.6.500,4.0.0)", org.eclipse.core.filebuffers;bundle-version="[3.6.700,4.0.0)", diff --git a/doc/org.eclipse.cdt.doc.isv/guide/deprecated_API_removals.html b/doc/org.eclipse.cdt.doc.isv/guide/deprecated_API_removals.html index 220b558c10a..ce76a6ee7e8 100644 --- a/doc/org.eclipse.cdt.doc.isv/guide/deprecated_API_removals.html +++ b/doc/org.eclipse.cdt.doc.isv/guide/deprecated_API_removals.html @@ -33,6 +33,7 @@

  1. Eclipse CDT requires Java 11 as a minimum to build and run.
    2. +
  2. Some deprecated methods and classes have been removed.
  3. Previously exported packages that were not API are now correctly marked as such.
  4. Activators removed for all bundles where possible.
  5. NewClassCreationWizardPage breaking changes.
    6. @@ -55,7 +56,16 @@

    See Bug 562494.

    -

    2. Previously exported packages that were not API are now correctly marked as such.

    + +

    2. Some deprecated methods and classes have been removed.

    +

    + Across the CDT code base some previously deprecated code has been removed. +

      +
    • EnvironmentReader.getRawEnvVars has been removed. Use EnvironmentReader.getEnvVars instead. See Bug 564123.
      • +
    +

    + +

    3. Previously exported packages that were not API are now correctly marked as such.

    A review of the previously exported API of CDT was performed. A lot of what was previously marked as public API has now been marked as internal. This means the API has either had x-internal or x-friends @@ -91,7 +101,7 @@

    -

    3. Activators removed for all bundles where possible.

    +

    4. Activators removed for all bundles where possible.

    Where possible bundles have had their Activators removed. Some of these activators were API and are no longer available. See Bug 561635 for @@ -104,7 +114,7 @@

    -

    4. NewClassCreationWizardPage breaking changes.

    +

    5. NewClassCreationWizardPage breaking changes.

    The NewClassCreationWizardPage has some API breaking changes due to how some protected fields, especially ALL_FIELDS was used. While this breaks binary @@ -113,7 +123,7 @@ href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=561770" target="_blank">Bug 561770.

    -

    5. Arduino plug-ins and features removed.

    +

    6. Arduino plug-ins and features removed.

    The CDT Arduino plug-ins and features have been removed. Arduino can still be used with CDT with manual maintenance of packages, etc. Or a third-party add-on such as Sloeber can be used as a @@ -132,7 +142,7 @@ See Bug 562498.

    -

    6. Remove LRParser, XLC and UPC.

    +

    7. Remove LRParser, XLC and UPC.

    The LR, UPC and XLC support have been removed from CDT. The bundles have not been maintained for a while and were not functional anymore. @@ -169,7 +179,7 @@ See Bug 562498.

    -

    7. Remove org.eclipse.cdt.utils.Platform.

    +

    8. Remove org.eclipse.cdt.utils.Platform.

    Class org.eclipse.cdt.utils.Platform has been removed. Use org.eclipse.core.runtime.Platform instead.

    diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF index 329e6666197..cf7f7e5db79 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.cdt.dsf.gdb;singleton:=true -Bundle-Version: 5.8.100.qualifier +Bundle-Version: 5.8.200.qualifier Bundle-Activator: org.eclipse.cdt.dsf.gdb.internal.GdbPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.cdt.gdb;bundle-version="7.0.0", org.eclipse.core.resources, org.eclipse.launchbar.core;bundle-version="2.0.0";visibility:=reexport, - org.eclipse.cdt.core.native;bundle-version="[5.10.0,6.0.0)", + org.eclipse.cdt.core.native;bundle-version="[6.0.0,7.0.0)", org.eclipse.cdt.native.serial;bundle-version="1.1.100" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8