From 110964efac4518fb2d18ac2d11c52e9d69dc0308 Mon Sep 17 00:00:00 2001
From: Nikolay Chashnikov <Nikolay.Chashnikov@jetbrains.com>
Date: Fri, 11 Feb 2022 17:13:48 +0300
Subject: [PATCH] [platform API] replace ApiStatus.ScheduledForRemoval
 annotation by 'forRemoval' attribute (IDEA-288466)

Since we don't want to specify planned removal date anymore, there is no need to use a separate annotation.

GitOrigin-RevId: 2295d925949b35668aa0f88fb8568b69ddd1e43d
---
 .../com/intellij/openapi/diagnostic/ErrorReportSubmitter.java | 4 +---
 platform/platform-impl/src/com/intellij/util/JdkBundle.java   | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/diagnostic/ErrorReportSubmitter.java b/platform/platform-api/src/com/intellij/openapi/diagnostic/ErrorReportSubmitter.java
index 8c7a8024dd8b..fea6e7e20a22 100644
--- a/platform/platform-api/src/com/intellij/openapi/diagnostic/ErrorReportSubmitter.java
+++ b/platform/platform-api/src/com/intellij/openapi/diagnostic/ErrorReportSubmitter.java
@@ -6,7 +6,6 @@ import com.intellij.openapi.extensions.PluginDescriptor;
 import com.intellij.openapi.util.NlsActions;
 import com.intellij.openapi.util.NlsContexts.DetailedDescription;
 import com.intellij.util.Consumer;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -90,8 +89,7 @@ public abstract class ErrorReportSubmitter implements PluginAware {
 
   //<editor-fold desc="Deprecated stuff.">
   /** @deprecated do not override; implement {@link #submit(IdeaLoggingEvent[], String, Component, Consumer)} instead */
-  @Deprecated
-  @ApiStatus.ScheduledForRemoval(inVersion = "2021.3")
+  @Deprecated(forRemoval = true)
   @SuppressWarnings("ALL")
   public SubmittedReportInfo submit(IdeaLoggingEvent[] events, Component parent) {
     throw new UnsupportedOperationException("'" + getClass().getName() + "' doesn't implement exception submitter API");
diff --git a/platform/platform-impl/src/com/intellij/util/JdkBundle.java b/platform/platform-impl/src/com/intellij/util/JdkBundle.java
index 27a652d54e83..5a911ad5f11e 100644
--- a/platform/platform-impl/src/com/intellij/util/JdkBundle.java
+++ b/platform/platform-impl/src/com/intellij/util/JdkBundle.java
@@ -11,7 +11,6 @@ import com.intellij.openapi.projectRoots.JdkUtil;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.util.lang.JavaVersion;
 import com.intellij.util.system.CpuArch;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.model.java.JdkVersionDetector;
@@ -24,7 +23,6 @@ import java.io.File;
  * {@link PathManager#getBundledRuntimePath()}, and {@link JdkVersionDetector}.
  */
 @Deprecated(forRemoval = true)
-@ApiStatus.ScheduledForRemoval(inVersion = "2022.1")
 @SuppressWarnings("ALL")
 public final class JdkBundle {
   private static final String BUNDLED_JDK_DIR_NAME = "jbr";