From a635f7e9790150fc1696e6936be0f5558213d2c8 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Sun, 31 May 2026 09:42:12 +0200
Subject: [PATCH] IJPL-241314 fix Java execution plugin registrations

Java backend no longer depends on Java execution implementation, so registering execution and test-discovery extensions from the backend descriptor makes split-mode plugin classloaders fail to create those extensions. Register them from the Java execution implementation module instead, and keep the related platform registrations in their owning descriptors.

Also add the missing Test Runner wrapper plugin to REST client env tests so test-runtime plugin resolution includes the extension points required by REST client request execution.

IJ-MR-184958 IJ-MR-184993 IJ-MR-179029 IJ-MR-184126 IJ-MR-181153 IJ-MR-146078 IJ-MR-175479 IJ-MR-186058 IJ-MR-193195 IJ-MR-196957 IJ-MR-199124 IJ-MR-197441 IJ-MR-204135 IJ-MR-204674 IJ-MR-205883

GitOrigin-RevId: 53920289ed61755459a1ebc4d84df1cb5b1a05c1
---
 .../intellij.java.execution.impl.xml          | 81 +++++++++++++++++++
 .../resources/META-INF/JavaActions.xml        | 29 -------
 .../resources/META-INF/JavaPlugin.xml         | 67 ---------------
 ...tellij.platform.execution.impl.backend.xml |  2 +
 .../intellij.platform.execution.impl.xml      |  4 +
 platform/execution/api-dump.txt               |  1 -
 platform/testRunner/api-dump.txt              |  1 -
 .../plugin/resources/META-INF/plugin.xml      |  2 +-
 .../intellij.platform.testRunner.xml          |  1 +
 9 files changed, 89 insertions(+), 99 deletions(-)

diff --git a/java/execution/impl/resources/intellij.java.execution.impl.xml b/java/execution/impl/resources/intellij.java.execution.impl.xml
index dce5ec43158d..0a5958c9498f 100644
--- a/java/execution/impl/resources/intellij.java.execution.impl.xml
+++ b/java/execution/impl/resources/intellij.java.execution.impl.xml
@@ -27,4 +27,85 @@
     <extensionPoint qualifiedName="com.intellij.threadDumpProvider"
                     interface="com.intellij.execution.impl.ThreadDumpProvider" dynamic="true"/>
   </extensionPoints>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <applicationService serviceInterface="com.intellij.execution.filters.ExceptionLineParserFactory"
+                        serviceImplementation="com.intellij.execution.filters.ExceptionLineParserFactoryImpl"/>
+    <applicationService serviceImplementation="com.intellij.execution.filters.StackTraceFoldingSettings"/>
+    <projectService serviceInterface="com.intellij.testIntegration.TestFailedLineManager"
+                    serviceImplementation="com.intellij.execution.codeInspection.TestFailedLineManagerImpl"/>
+    <console.folding implementation="com.intellij.execution.filters.StackTraceFolding"/>
+    <applicationService serviceInterface="com.intellij.execution.runners.ProcessProxyFactory"
+                        serviceImplementation="com.intellij.execution.runners.ProcessProxyFactoryImpl"/>
+    <consoleFilterProvider implementation="com.intellij.execution.filters.DefaultConsoleFiltersProvider"/>
+    <externalSystem.runConfigurationEx implementation="com.intellij.execution.ExternalSystemRunConfigurationJavaExtension"/>
+    <programRunner id="defaultRunRunner" implementation="com.intellij.execution.impl.DefaultJavaProgramRunner"/>
+    <java.programPatcher implementation="com.intellij.execution.ClasspathModificationPatcher" order="last"/>
+    <configurationType implementation="com.intellij.execution.application.ApplicationConfigurationType"/>
+    <configurationType implementation="com.intellij.execution.jar.JarApplicationConfigurationType"/>
+    <configurationType implementation="com.intellij.execution.scratch.JavaScratchConfigurationType"/>
+    <runConfigurationProducer implementation="com.intellij.execution.jar.JarApplicationConfigurationProducer"/>
+    <runConfigurationProducer implementation="com.intellij.execution.application.ApplicationConfigurationProducer"/>
+    <runConfigurationProducer implementation="com.intellij.execution.scratch.JavaScratchConfigurationProducer"/>
+    <configurationType implementation="com.intellij.execution.remote.RemoteConfigurationType"/>
+    <externalSystem.runConfigurationImporter implementation="com.intellij.execution.application.JavaApplicationRunConfigurationImporter"/>
+    <externalSystem.runConfigurationImporter implementation="com.intellij.execution.remote.JavaRemoteDebugRunConfigurationImporter"/>
+    <externalSystem.runConfigurationImporter implementation="com.intellij.execution.jar.JarApplicationRunConfigurationImporter"/>
+    <runLineMarkerContributor language="JVM"
+                              order="before applicationRunLineMarkerProvider"
+                              implementationClass="com.intellij.execution.application.JvmApplicationRunLineMarkerContributor"/>
+    <runLineMarkerContributor language="JAVA" id="applicationRunLineMarkerProvider"
+                              implementationClass="com.intellij.execution.application.ApplicationRunLineMarkerProvider"/>
+    <completion.contributor language="TEXT" implementationClass="com.intellij.execution.ui.VmOptionsCompletionContributor"
+                            order="first" id="VmOptionsCompletionContributor"/>
+    <applicationService serviceInterface="com.intellij.execution.vmOptions.VMOptionsService"
+                        serviceImplementation="com.intellij.execution.vmOptions.VMOptionsServiceImpl"/>
+    <runDashboardCustomizer implementation="com.intellij.execution.CommonJavaRunDashboardCustomizer" id="commonJavaCustomizer"/>
+    <additionalLibraryRootsProvider implementation="com.intellij.execution.AlternativeSdkRootsProvider"/>
+    <jdkUpdateCheckContributor implementation="com.intellij.execution.AlternativeSdkRootsProviderForJdkUpdate"/>
+    <programRunner implementation="com.intellij.execution.jar.JarApplicationDebuggerRunner"/>
+    <runConfigurationExtension implementation="com.intellij.execution.impl.JavaDebuggerAutoAttach"/>
+    <testDiffProvider language="JAVA" implementationClass="com.intellij.execution.testframework.JvmTestDiffProvider"/>
+    <consoleOptionsProvider instance="com.intellij.execution.filters.StackTraceFoldingConfigurable"/>
+    <jreProvider implementation="com.intellij.execution.ui.BundledJreProvider"/>
+    <importTestOutput implementation="com.intellij.execution.AntTestContentHandler$AntTestOutputExtension"/>
+    <compiler.task execute="AFTER" implementation="com.intellij.execution.scratch.JavaScratchCompilationSupport"/>
+    <threadDumpProvider implementation="com.intellij.execution.impl.JstackThreadDumpProvider"/>
+    <threadDumpProvider implementation="com.intellij.execution.impl.AttachAPIThreadDumpProvider" order="last"/>
+    <applicationSettings service="com.intellij.execution.filters.StackTraceFoldingSettings"/>
+    <postStartupActivity implementation="com.intellij.execution.testDiscovery.TestDiscoveryIndex$MyPostStartUpActivity"/>
+    <vcs.changeListDecorator implementation="com.intellij.execution.testDiscovery.AffectedTestsInChangeListPainter"/>
+    <projectService serviceImplementation="com.intellij.execution.testDiscovery.JavaAutoRunManager"/>
+    <runConfigurationExtension implementation="com.intellij.execution.testDiscovery.TestDiscoveryExtension"/>
+    <projectSettings service="com.intellij.execution.testDiscovery.JavaAutoRunManager"/>
+  </extensions>
+
+  <actions resource-bundle="messages.ActionsBundle">
+    <action id="ShowRecentTests" class="com.intellij.testIntegration.ShowRecentTests">
+      <keyboard-shortcut first-keystroke="control shift SEMICOLON" keymap="$default"/>
+    </action>
+
+    <action class="com.intellij.execution.testDiscovery.actions.FindUnusedTestDataAction" id="FindUsedTestData"
+            internal="true"/>
+
+    <action id="JavaSoftExit" class="com.intellij.execution.impl.DefaultJavaProgramRunner$SoftExitAction">
+      <add-to-group group-id="RunTab.TopToolbar" anchor="after" relative-to-action="Stop"/>
+      <add-to-group group-id="RunTab.TopToolbar.Old" anchor="after" relative-to-action="Stop"/>
+    </action>
+
+    <action id="JavaControlBreak" class="com.intellij.execution.impl.DefaultJavaProgramRunner$ControlBreakAction">
+      <add-to-group group-id="RunTab.TopToolbar" anchor="after" relative-to-action="Stop"/>
+      <add-to-group group-id="RunTab.TopToolbar.Old" anchor="after" relative-to-action="Stop"/>
+    </action>
+
+    <group id="ChangesViewPopupMenuRunGroup">
+      <reference ref="RunContextPopupGroup"/>
+      <add-to-group group-id="ChangesViewPopupMenu" anchor="before" relative-to-action="ShowDiscoveredTests"/>
+    </group>
+
+    <action class="com.intellij.execution.testDiscovery.actions.ShowAffectedTestsAction" id="ShowDiscoveredTests">
+      <add-to-group group-id="RunTestGroup" anchor="last"/>
+      <add-to-group group-id="ChangesViewPopupMenu" anchor="last"/>
+    </action>
+  </actions>
 </idea-plugin>
diff --git a/java/java-backend/resources/META-INF/JavaActions.xml b/java/java-backend/resources/META-INF/JavaActions.xml
index 587ea2c5a45c..aa7cb14f2b80 100644
--- a/java/java-backend/resources/META-INF/JavaActions.xml
+++ b/java/java-backend/resources/META-INF/JavaActions.xml
@@ -50,35 +50,6 @@
     <action id="ShowSiblings" class="com.intellij.codeInsight.hint.actions.ShowSiblingsAction">
       <add-to-group group-id="QuickActions" anchor="after" relative-to-action="QuickImplementations"/>
     </action>
-    <action id="ShowRecentTests" class="com.intellij.testIntegration.ShowRecentTests">
-      <keyboard-shortcut first-keystroke="control shift SEMICOLON" keymap="$default"/>
-    </action>
-
-    <group id="ChangesViewPopupMenuRunGroup">
-      <reference ref="RunContextPopupGroup"/>
-      <add-to-group group-id="ChangesViewPopupMenu" anchor="before" relative-to-action="ShowDiscoveredTests"/>
-    </group>
-
-    <action class="com.intellij.execution.testDiscovery.actions.ShowAffectedTestsAction" id="ShowDiscoveredTests">
-      <add-to-group group-id="RunTestGroup" anchor="last"/>
-      <add-to-group group-id="ChangesViewPopupMenu" anchor="last"/>
-    </action>
-
-    <action class="com.intellij.execution.testDiscovery.actions.FindUnusedTestDataAction" id="FindUsedTestData"
-            internal="true"/>
-
-
-
-    <action id="JavaSoftExit" class="com.intellij.execution.impl.DefaultJavaProgramRunner$SoftExitAction">
-      <add-to-group group-id="RunTab.TopToolbar" anchor="after" relative-to-action="Stop"/>
-      <add-to-group group-id="RunTab.TopToolbar.Old" anchor="after" relative-to-action="Stop"/>
-    </action>
-
-    <action id="JavaControlBreak" class="com.intellij.execution.impl.DefaultJavaProgramRunner$ControlBreakAction">
-      <add-to-group group-id="RunTab.TopToolbar" anchor="after" relative-to-action="Stop"/>
-      <add-to-group group-id="RunTab.TopToolbar.Old" anchor="after" relative-to-action="Stop"/>
-    </action>
-
     <!-- View -->
     <reference ref="DelegateMethods">
       <add-to-group group-id="CodeMenu" anchor="after" relative-to-action="ImplementMethods"/>
diff --git a/java/java-backend/resources/META-INF/JavaPlugin.xml b/java/java-backend/resources/META-INF/JavaPlugin.xml
index 3bb003c2c823..b18631a8bd5a 100644
--- a/java/java-backend/resources/META-INF/JavaPlugin.xml
+++ b/java/java-backend/resources/META-INF/JavaPlugin.xml
@@ -73,16 +73,12 @@
                         serviceImplementation="com.intellij.refactoring.util.RefactoringConflictsUtilImpl"/>
     <applicationService serviceImplementation="com.intellij.compiler.server.BuildManager" preload="true"/>
 
-    <applicationService serviceInterface="com.intellij.execution.filters.ExceptionLineParserFactory"
-                        serviceImplementation="com.intellij.execution.filters.ExceptionLineParserFactoryImpl"/>
     <compilableFileTypesProvider implementation="com.intellij.compiler.impl.javaCompiler.JavaCompilableFileTypesProvider"/>
     <postStartupActivity implementation="com.intellij.compiler.server.BuildManager$BuildManagerStartupActivity"/>
     <postStartupActivity implementation="com.intellij.ide.SetupJavaProjectFromSourcesActivity"/>
     <postStartupActivity implementation="com.intellij.jarRepository.RepositoryLibraryExtendedPropertiesUpdateStartupActivity"/>
     <backgroundPostStartupActivity implementation="com.intellij.compiler.cache.CompilerCacheStartupActivity"/>
 
-    <console.folding implementation="com.intellij.execution.filters.StackTraceFolding"/>
-
     <projectService serviceInterface="com.intellij.packaging.artifacts.ArtifactManager"
                     serviceImplementation="com.intellij.packaging.impl.artifacts.workspacemodel.ArtifactManagerBridge" preload="await"/>
     <projectService serviceInterface="com.intellij.packaging.artifacts.LegacyBridgeJpsArtifactEntitySourceFactory"
@@ -112,8 +108,6 @@
 
     <applicationService serviceImplementation="com.intellij.openapi.module.WebModuleTypeRegistrar" preload="true"/>
 
-    <postStartupActivity implementation="com.intellij.execution.testDiscovery.TestDiscoveryIndex$MyPostStartUpActivity"/>
-
     <applicationService serviceImplementation="com.intellij.codeInsight.generation.SetterTemplatesManager"/>
     <applicationService serviceImplementation="com.intellij.codeInsight.generation.GetterTemplatesManager"/>
     <applicationService serviceImplementation="com.intellij.codeInsight.generation.EqualsHashCodeTemplatesManager"/>
@@ -121,7 +115,6 @@
     <applicationService serviceImplementation="com.intellij.codeInsight.javadoc.JavaDocInfoGeneratorFactory" open="true"/>
     <applicationService serviceImplementation="com.intellij.pom.java.AcceptedLanguageLevelsSettings"/>
     <applicationService serviceImplementation="com.intellij.refactoring.JavaRefactoringSettings"/>
-    <applicationService serviceImplementation="com.intellij.execution.filters.StackTraceFoldingSettings"/>
     <applicationService serviceInterface="com.intellij.refactoring.JavaRefactoringActionHandlerFactory"
                         serviceImplementation="com.intellij.refactoring.openapi.impl.JavaRefactoringActionHandlerFactoryImpl"/>
     <applicationService serviceInterface="com.intellij.psi.JavaDirectoryService"
@@ -145,8 +138,6 @@
     <optionController implementation="com.intellij.codeInsight.JavaIdeCodeInsightSettings$Provider"/>
     <optionController implementation="com.intellij.codeInsight.OrderEntryConfigurationProvider"/>
     <applicationService serviceImplementation="com.intellij.codeInsight.JavaIdeCodeInsightSettings"/>
-    <projectService serviceInterface="com.intellij.testIntegration.TestFailedLineManager"
-                    serviceImplementation="com.intellij.execution.codeInspection.TestFailedLineManagerImpl"/>
     <projectService serviceInterface="com.intellij.codeInspection.ex.EntryPointsManager"
                     serviceImplementation="com.intellij.codeInspection.ex.impl.EntryPointsManagerImpl"/>
     <projectService serviceInterface="com.intellij.openapi.roots.JavaProjectModelModificationService"
@@ -233,9 +224,6 @@
     <openapi.projectRoots.externalJavaConfigurationMissingAction implementation="com.intellij.openapi.projectRoots.impl.ExternalJavaConfigurationRefreshAction"/>
     <postStartupActivity implementation="com.intellij.openapi.projectRoots.impl.ExternalJavaConfigurationActivity"/>
 
-    <applicationService serviceInterface="com.intellij.execution.runners.ProcessProxyFactory"
-                        serviceImplementation="com.intellij.execution.runners.ProcessProxyFactoryImpl"/>
-
     <statistics.counterUsagesCollector implementationClass="com.intellij.find.findUsages.JavaFindUsagesCollector"/>
     <statistics.counterUsagesCollector implementationClass="com.intellij.refactoring.extractMethod.JavaExtractMethodCollector"/>
     <statistics.counterUsagesCollector
@@ -277,8 +265,6 @@
 
     <changesGroupingPolicy key="module" id="module" weight="20"
                            implementationClass="com.intellij.openapi.vcs.changes.ui.ModuleChangesGroupingPolicy$Factory"/>
-    <vcs.changeListDecorator implementation="com.intellij.execution.testDiscovery.AffectedTestsInChangeListPainter"/>
-
     <projectService serviceInterface="com.intellij.openapi.vcs.impl.VcsPathPresenter"
                     serviceImplementation="com.intellij.openapi.vcs.impl.ModuleVcsPathPresenter"
                     overrides="true"/>
@@ -349,7 +335,6 @@
 
     <applicationService serviceImplementation="com.intellij.ide.util.newProjectWizard.SelectTemplateSettings"/>
 
-    <consoleFilterProvider implementation="com.intellij.execution.filters.DefaultConsoleFiltersProvider"/>
 
     <selectInTarget implementation="com.intellij.ide.impl.ProjectStructureSelectInTarget"/>
 
@@ -388,15 +373,11 @@
     <externalSystem.beforeRunTaskImporter
       implementation="com.intellij.openapi.externalSystem.service.project.settings.BuildArtifactsTaskImporter"/>
     <externalSystemConfigurationHandler implementation="com.intellij.openapi.externalSystem.service.project.settings.ArtifactsImporter"/>
-    <externalSystem.runConfigurationEx implementation="com.intellij.execution.ExternalSystemRunConfigurationJavaExtension"/>
     <applicationService serviceInterface="com.intellij.openapi.externalSystem.service.execution.ExternalSystemJdkProvider"
                         serviceImplementation="com.intellij.openapi.externalSystem.service.execution.ExternalSystemJavaSdkProvider"
                         overrides="true"/>
     <programRunner implementation="com.intellij.openapi.externalSystem.service.execution.ExternalSystemTaskDebugRunner"/>
 
-    <programRunner id="defaultRunRunner" implementation="com.intellij.execution.impl.DefaultJavaProgramRunner"/>
-    <java.programPatcher implementation="com.intellij.execution.ClasspathModificationPatcher" order="last"/>
-
     <postStartupActivity implementation="com.intellij.openapi.projectRoots.JavaVersionChecker"/>
 
     <checkinHandlerFactory implementation="com.intellij.compiler.impl.vcs.UnloadedModulesCompilationCheckinHandler$Factory"/>
@@ -417,8 +398,6 @@
                          implementationClass="com.intellij.codeInsight.hint.NextParameterAfterCompletionHandler"/>
     <compiler.updateResourcesBuildContributor implementation="com.intellij.compiler.impl.JavaResourcesBuildContributor"/>
 
-    <projectService serviceImplementation="com.intellij.execution.testDiscovery.JavaAutoRunManager"/>
-
     <applicationService serviceInterface="com.intellij.framework.library.DownloadableLibraryService"
                         serviceImplementation="com.intellij.framework.library.impl.DownloadableLibraryServiceImpl"/>
 
@@ -433,7 +412,6 @@
 
     <lang.smartEnterProcessor language="JSPX" implementationClass="com.intellij.codeInsight.completion.XmlSmartEnterProcessor"/>
 
-    <iconProvider implementation="com.intellij.execution.testframework.TestIconProvider" id="testIcons"/>
     <stacktrace.fold.line.modifier implementation="com.intellij.execution.JavaModuleNameStacktraceModifier"/>
     <stacktrace.fold substring="at java.awt.EventDispatchThread"/>
     <stacktrace.fold substring="at java.awt.Window.dispatchEventImpl("/>
@@ -507,38 +485,11 @@
 
     <patterns.patternClass className="com.intellij.patterns.PsiJavaPatterns" alias="java"/>
 
-    <configurationType implementation="com.intellij.execution.application.ApplicationConfigurationType"/>
-    <configurationType implementation="com.intellij.execution.jar.JarApplicationConfigurationType"/>
-    <configurationType implementation="com.intellij.execution.scratch.JavaScratchConfigurationType"/>
-    <runConfigurationProducer implementation="com.intellij.execution.jar.JarApplicationConfigurationProducer"/>
-    <runConfigurationProducer implementation="com.intellij.execution.application.ApplicationConfigurationProducer"/>
-    <runConfigurationProducer implementation="com.intellij.execution.scratch.JavaScratchConfigurationProducer"/>
-    <configurationType implementation="com.intellij.execution.remote.RemoteConfigurationType"/>
-
-    <executionTargetLanguageRuntimeType implementation="com.intellij.execution.target.java.JavaLanguageRuntimeType"/>
-    <applicationService serviceInterface="com.intellij.execution.target.java.JavaLanguageRuntimeUIFactory"
-                        serviceImplementation="com.intellij.execution.target.java.JavaLanguageRuntimeUIFactoryImpl"/>
-
-    <externalSystem.runConfigurationImporter implementation="com.intellij.execution.application.JavaApplicationRunConfigurationImporter"/>
-    <externalSystem.runConfigurationImporter implementation="com.intellij.execution.remote.JavaRemoteDebugRunConfigurationImporter"/>
     <externalSystem.modifiableModelsProvider
       implementation="com.intellij.openapi.externalSystem.service.project.PackagingModifiableModelProvider"/>
-    <externalSystem.runConfigurationImporter implementation="com.intellij.execution.jar.JarApplicationRunConfigurationImporter"/>
     <configuration.ModuleStructureExtension
       implementation="com.intellij.openapi.externalSystem.service.project.ExternalModuleStructureExtension"/>
 
-    <runLineMarkerContributor language="JVM"
-                              order="before applicationRunLineMarkerProvider"
-                              implementationClass="com.intellij.execution.application.JvmApplicationRunLineMarkerContributor"/>
-    <runLineMarkerContributor language="JAVA" id="applicationRunLineMarkerProvider"
-                              implementationClass="com.intellij.execution.application.ApplicationRunLineMarkerProvider"/>
-    <completion.contributor language="TEXT" implementationClass="com.intellij.execution.ui.VmOptionsCompletionContributor"
-                            order="first" id="VmOptionsCompletionContributor"/>
-    <applicationService serviceInterface="com.intellij.execution.vmOptions.VMOptionsService"
-                        serviceImplementation="com.intellij.execution.vmOptions.VMOptionsServiceImpl"/>
-
-    <runDashboardCustomizer implementation="com.intellij.execution.CommonJavaRunDashboardCustomizer" id="commonJavaCustomizer"/>
-
     <warmupConfigurator implementation="com.intellij.ide.warmup.JdkWarmupConfigurator"/>
     <postStartupActivity implementation="com.intellij.ide.warmup.JdkWarmupProjectActivity"/>
     <environmentKeyProvider implementation="com.intellij.execution.environment.JvmEnvironmentKeyProvider"/>
@@ -566,11 +517,6 @@
                          bundle="messages.JavaBundle" key="jvm.logging.configurable.display.name"/>
     <jvm.exceptionFilter implementation="com.intellij.execution.filters.NavigateToExceptionClassFilter"/>
 
-    <additionalLibraryRootsProvider implementation="com.intellij.execution.AlternativeSdkRootsProvider"/>
-    <jdkUpdateCheckContributor implementation="com.intellij.execution.AlternativeSdkRootsProviderForJdkUpdate"/>
-
-    <programRunner implementation="com.intellij.execution.jar.JarApplicationDebuggerRunner"/>
-
     <iconLayerProvider implementation="com.intellij.compiler.CompilerIconLayerProvider"/>
     <fileIconPatcher implementation="com.intellij.ide.JavaExcludedFileIconPatcher" order="after javaFileIconPatcher"/>
     <editorTabTitleProvider implementation="com.intellij.ui.JavaEditorTabTitleProvider"/>
@@ -589,9 +535,6 @@
     <projectStructureDetector implementation="com.intellij.ide.util.projectWizard.importSources.impl.JavaProjectStructureDetector"
                               order="first"/>
 
-    <runConfigurationExtension implementation="com.intellij.execution.testDiscovery.TestDiscoveryExtension"/>
-    <runConfigurationExtension implementation="com.intellij.execution.impl.JavaDebuggerAutoAttach"/>
-
     <completion.contributor language="JAVA" id="methodsChainsCompletionContributor" order="first"
                             implementationClass="com.intellij.compiler.chainsSearch.completion.MethodChainCompletionContributor"/>
     <weigher order="after stats" key="completion" id="methodChains"
@@ -603,7 +546,6 @@
                              handlerClass="com.intellij.codeInsight.intention.impl.config.AssignmentTooltipLinkHandler"/>
     <library.javaSourceRootDetector implementation="com.intellij.openapi.roots.ui.configuration.LibraryJavaSourceRootDetector"/>
 
-    <importTestOutput implementation="com.intellij.execution.AntTestContentHandler$AntTestOutputExtension"/>
 
     <library.type implementation="com.intellij.jarRepository.RepositoryLibraryType"/>
     <library.type implementation="com.intellij.externalSystem.ImportedLibraryType"/>
@@ -767,7 +709,6 @@
     <renameInputValidator implementation="com.intellij.refactoring.rename.PsiPackageRenameValidator"/>
     <renameInputValidator implementation="com.intellij.refactoring.rename.JavaModuleRenameValidator"/>
     <renameInputValidator implementation="com.intellij.refactoring.rename.JavaTypeRenameValidator"/>
-    <testDiffProvider language="JAVA" implementationClass="com.intellij.execution.testframework.JvmTestDiffProvider"/>
     <renamePsiElementProcessor implementation="com.intellij.refactoring.rename.RenamePsiPackageProcessor"/>
     <renamePsiElementProcessor implementation="com.intellij.refactoring.rename.RenamePsiDirectoryProcessor"/>
     <renamePsiElementProcessor implementation="com.intellij.refactoring.rename.RenameJavaClassProcessor"/>
@@ -1255,7 +1196,6 @@
                                             implementationClass="com.intellij.codeInsight.daemon.impl.quickfix.JavaCreateFieldFromUsageHelper"/>
     <expressionConverter implementationClass="com.intellij.refactoring.introduceParameter.JavaExpressionConverter" language="JAVA"/>
     <codeFoldingOptionsProvider instance="com.intellij.application.options.editor.JavaCodeFoldingOptionsProvider" id="JAVA" order="after Android,after C++,after Dart,after General,after Go,after Handlebars, after ObjectiveC"/>
-    <consoleOptionsProvider instance="com.intellij.execution.filters.StackTraceFoldingConfigurable"/>
     <autoImportOptionsProvider instance="com.intellij.application.options.editor.JavaAutoImportOptions"/>
     <errorOptionsProvider instance="com.intellij.java.codeInspection.ui.JavaErrorOptionsProvider"/>
     <overrideImplementsAnnotationsHandler implementation="com.intellij.codeInsight.generation.OverrideImplementsAnnotationsHandlerImpl"/>
@@ -1291,7 +1231,6 @@
 
     <java.externalAnnotation.locationProvider
       implementation="com.intellij.codeInsight.externalAnnotation.location.JBBundledAnnotationsProvider"/>
-    <jreProvider implementation="com.intellij.execution.ui.BundledJreProvider"/>
     <vcs.codeVisionLanguageContext language="JAVA" implementationClass="com.intellij.codeInsight.hints.JavaVcsCodeVisionContext"/>
     <codeInsight.codeVisionSettingsPreviewLanguage modelId="vcs.code.vision" language="JAVA"/>
     <codeInsight.codeVisionProvider implementation="com.intellij.codeInsight.daemon.impl.JavaReferencesCodeVisionProvider"/>
@@ -1322,7 +1261,6 @@
     <notificationGroup id="Legacy Library" displayType="TOOL_WINDOW" bundle="messages.JavaBundle" key="notification.group.legacy.library"/>
 
     <compiler.task execute="BEFORE" implementation="com.intellij.jarRepository.CompilationDependenciesResolutionTask"/>
-    <compiler.task execute="AFTER" implementation="com.intellij.execution.scratch.JavaScratchCompilationSupport"/>
 
     <jarRepositoryAuthenticationDataProvider implementation="com.intellij.jarRepository.MavenSettingsXmlRepositoryAuthenticationDataProvider"
                                              order="last"/>
@@ -1360,9 +1298,6 @@
 
     <optionController implementation="com.intellij.compiler.JavaCompilerConfiguration$Provider"/>
 
-    <threadDumpProvider implementation="com.intellij.execution.impl.JstackThreadDumpProvider"/>
-    <threadDumpProvider implementation="com.intellij.execution.impl.AttachAPIThreadDumpProvider" order="last"/>
-
     <pluginSuggestionProvider implementation="com.intellij.ide.ant.AntSuggestionProvider"/>
     <pluginSuggestionProvider implementation="com.intellij.ide.android.AndroidSuggestionProvider"/>
     <statistics.counterUsagesCollector
@@ -1453,7 +1388,6 @@
     <projectSettings service="com.intellij.compiler.impl.rmiCompiler.RmicConfiguration"/>
     <projectSettings service="com.intellij.compiler.impl.javaCompiler.eclipse.EclipseCompilerConfiguration"/>
     <applicationSettings service="org.jetbrains.java.generate.template.toString.ToStringTemplatesManager"/>
-    <projectSettings service="com.intellij.execution.testDiscovery.JavaAutoRunManager"/>
     <projectSettings service="com.intellij.compiler.server.impl.BuildProcessCustomPluginsConfiguration"/>
     <projectSettings service="com.intellij.compiler.options.ValidationConfiguration$ExcludedFromValidationConfiguration"/>
     <projectSettings service="com.intellij.compiler.options.ValidationConfiguration"/>
@@ -1462,7 +1396,6 @@
     <projectSettings service="com.intellij.jarRepository.services.MavenRepositoryServicesManager"/>
     <projectSettings service="com.intellij.jarRepository.RemoteRepositoriesConfiguration"/>
     <applicationSettings service="org.jetbrains.java.generate.GenerateToStringContext"/>
-    <applicationSettings service="com.intellij.execution.filters.StackTraceFoldingSettings"/>
     <projectSettings service="com.intellij.codeInspection.ex.impl.EntryPointsManagerImpl"/>
     <projectSettings service="com.intellij.codeInsight.JavaProjectCodeInsightSettings"/>
     <applicationSettings service="com.intellij.codeInsight.JavaIdeCodeInsightSettings"/>
diff --git a/platform/execution-impl/backend/resources/intellij.platform.execution.impl.backend.xml b/platform/execution-impl/backend/resources/intellij.platform.execution.impl.backend.xml
index 9e1597c28c7b..4486053ca166 100644
--- a/platform/execution-impl/backend/resources/intellij.platform.execution.impl.backend.xml
+++ b/platform/execution-impl/backend/resources/intellij.platform.execution.impl.backend.xml
@@ -13,6 +13,8 @@
   </dependencies>
   <!-- endregion -->
   <extensions defaultExtensionNs="com.intellij">
+    <!--suppress PluginXmlRegistrationCheck -->
+    <executionTargetLanguageRuntimeType implementation="com.intellij.execution.target.java.JavaLanguageRuntimeType"/>
     <platform.rpc.backend.remoteApiProvider
       implementation="com.intellij.platform.execution.impl.backend.BackendExecutionRemoteApiProvider"/>
     <execution.impl.runSessionService implementation="com.intellij.platform.execution.impl.backend.BackendRunSessionService"/>
diff --git a/platform/execution-impl/resources/intellij.platform.execution.impl.xml b/platform/execution-impl/resources/intellij.platform.execution.impl.xml
index b03879f052d6..631a0de41983 100644
--- a/platform/execution-impl/resources/intellij.platform.execution.impl.xml
+++ b/platform/execution-impl/resources/intellij.platform.execution.impl.xml
@@ -42,4 +42,8 @@
     <module name="intellij.platform.util.ui"/>
   </dependencies>
   <!-- endregion -->
+  <extensions defaultExtensionNs="com.intellij">
+    <applicationService serviceInterface="com.intellij.execution.target.java.JavaLanguageRuntimeUIFactory"
+                        serviceImplementation="com.intellij.execution.target.java.JavaLanguageRuntimeUIFactoryImpl"/>
+  </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/platform/execution/api-dump.txt b/platform/execution/api-dump.txt
index 235e8434adfa..719cd846bb52 100644
--- a/platform/execution/api-dump.txt
+++ b/platform/execution/api-dump.txt
@@ -155,7 +155,6 @@ com.intellij.execution.configurations.TargetAwareRunProfile
 - com.intellij.execution.configurations.RunProfile
 - a:canRunOn(com.intellij.execution.ExecutionTarget):Z
 com.intellij.execution.configurations.VirtualConfigurationType
-com.intellij.execution.configurations.VisibleRunContentState
 com.intellij.execution.configurations.WithoutOwnBeforeRunSteps
 com.intellij.execution.configurations.WrappingRunConfiguration
 - com.intellij.execution.configurations.WithoutOwnBeforeRunSteps
diff --git a/platform/testRunner/api-dump.txt b/platform/testRunner/api-dump.txt
index 8bdccfad8f81..98a2c6c11712 100644
--- a/platform/testRunner/api-dump.txt
+++ b/platform/testRunner/api-dump.txt
@@ -91,7 +91,6 @@ a:com.intellij.execution.testframework.Filter
 - select(java.util.List):java.util.List
 - a:shouldAccept(com.intellij.execution.testframework.AbstractTestProxy):Z
 com.intellij.execution.testframework.HistoryTestRunnableState
-- com.intellij.execution.configurations.VisibleRunContentState
 c:com.intellij.execution.testframework.HyperLink
 - com.intellij.execution.testframework.Printable
 - <init>(java.lang.String,com.intellij.execution.filters.HyperlinkInfo):V
diff --git a/platform/testRunner/plugin/resources/META-INF/plugin.xml b/platform/testRunner/plugin/resources/META-INF/plugin.xml
index 2a8ee8155284..aa3c60d62b70 100644
--- a/platform/testRunner/plugin/resources/META-INF/plugin.xml
+++ b/platform/testRunner/plugin/resources/META-INF/plugin.xml
@@ -10,6 +10,6 @@
     <module name="intellij.platform.smRunner" loading="required"/>
     <module name="intellij.platform.smRunner.frontend.split" required-if-available="intellij.platform.frontend.split"/>
     <module name="intellij.platform.smRunner.vcs"/>
-    <module name="intellij.platform.smRunner.backend.split" required-if-available="intellij.platform.backend"/>
+    <module name="intellij.platform.smRunner.backend.split"/>
   </content>
 </idea-plugin>
diff --git a/platform/testRunner/resources/intellij.platform.testRunner.xml b/platform/testRunner/resources/intellij.platform.testRunner.xml
index fa071cef1ab9..fffed736b0eb 100644
--- a/platform/testRunner/resources/intellij.platform.testRunner.xml
+++ b/platform/testRunner/resources/intellij.platform.testRunner.xml
@@ -24,6 +24,7 @@
   <!-- endregion -->
   <extensions defaultExtensionNs="com.intellij">
     <actionPromoter implementation="com.intellij.execution.testframework.TestTreeViewActionsPromoter"/>
+    <iconProvider implementation="com.intellij.execution.testframework.TestIconProvider" id="testIcons"/>
     <notificationGroup id="Test Runner" displayType="NONE" bundle="messages.TestRunnerBundle" key="notification.group.test.runner"/>
     <projectSettings service="com.intellij.execution.testframework.autotest.AutoTestManager"/>
   </extensions>