From 12332362145f19d7d53a649333cd02a73cdb7748 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 11 Jan 2019 19:15:29 +0100
Subject: [PATCH] Move registration of JavaSdk[Impl] to a more appropriate
 location

---
 java/java-impl/src/META-INF/JavaPlugin.xml     | 4 ++++
 resources/src/componentSets/IdeaComponents.xml | 1 -
 resources/src/componentSets/Misc.xml           | 8 --------
 3 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 resources/src/componentSets/Misc.xml

diff --git a/java/java-impl/src/META-INF/JavaPlugin.xml b/java/java-impl/src/META-INF/JavaPlugin.xml
index ba6e9ca85578..8922f2851b63 100644
--- a/java/java-impl/src/META-INF/JavaPlugin.xml
+++ b/java/java-impl/src/META-INF/JavaPlugin.xml
@@ -22,6 +22,10 @@
     <component>
       <implementation-class>com.intellij.util.xml.impl.JavaDomApplicationComponent</implementation-class>
     </component>
+    <component>
+      <interface-class>com.intellij.openapi.projectRoots.JavaSdk</interface-class>
+      <implementation-class>com.intellij.openapi.projectRoots.impl.JavaSdkImpl</implementation-class>
+    </component>
   </application-components>
 
   <project-components>
diff --git a/resources/src/componentSets/IdeaComponents.xml b/resources/src/componentSets/IdeaComponents.xml
index 41c28d2e1940..2e343cc3a65d 100644
--- a/resources/src/componentSets/IdeaComponents.xml
+++ b/resources/src/componentSets/IdeaComponents.xml
@@ -33,7 +33,6 @@
   <xi:include href="/componentSets/ProjectView.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/componentSets/Editor.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/componentSets/ExternalSystemComponents.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="Misc.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="Compiler.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/componentSets/Execution.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/componentSets/VCS.xml" xpointer="xpointer(/idea-plugin/*)"/>
diff --git a/resources/src/componentSets/Misc.xml b/resources/src/componentSets/Misc.xml
deleted file mode 100644
index 8180e5f0e446..000000000000
--- a/resources/src/componentSets/Misc.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<idea-plugin>
-  <application-components>
-    <component>
-      <interface-class>com.intellij.openapi.projectRoots.JavaSdk</interface-class>
-      <implementation-class>com.intellij.openapi.projectRoots.impl.JavaSdkImpl</implementation-class>
-    </component>
-  </application-components>
-</idea-plugin>