preparing to migrate to Java 8: explicitly set 'IDEA jdk' as 'Module SDK' for modules which will remain on Java 6 and older

2026-04-19 13:02:30 +07:00 · 2015-12-22 14:24:56 +03:00
parent 1b57892511
commit 1a6f701e36
51 changed files with 51 additions and 51 deletions
--- a/java/compiler/forms-compiler/forms-compiler.iml
+++ b/java/compiler/forms-compiler/forms-compiler.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="JDOM" level="project" />
    <orderEntry type="module" module-name="forms_rt" />
--- a/java/compiler/instrumentation-util/instrumentation-util.iml
+++ b/java/compiler/instrumentation-util/instrumentation-util.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="asm5" level="project" />
  </component>
--- a/java/compiler/javac2/javac2.iml
+++ b/java/compiler/javac2/javac2.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="Ant" level="project" />
    <orderEntry type="module" module-name="forms-compiler" />
--- a/java/java-psi-api/java-psi-api.iml
+++ b/java/java-psi-api/java-psi-api.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="core-api" exported="" />
    <orderEntry type="module" module-name="projectModel-api" />
--- a/java/java-psi-impl/java-psi-impl.iml
+++ b/java/java-psi-impl/java-psi-impl.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="java-psi-api" exported="" />
    <orderEntry type="module" module-name="core-impl" exported="" />
--- a/java/java-runtime/java-runtime.iml
+++ b/java/java-runtime/java-runtime.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" scope="PROVIDED" name="JUnit3" level="project" />
    <orderEntry type="library" scope="PROVIDED" name="JUnit4" level="project" />
--- a/jps/antLayout/antlayout.iml
+++ b/jps/antLayout/antlayout.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="Ant" level="project" />
  </component>
--- a/jps/jps-builders/jps-builders.iml
+++ b/jps/jps-builders/jps-builders.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="util" exported="" />
    <orderEntry type="module" module-name="forms_rt" />
--- a/jps/jps-launcher/jps-launcher.iml
+++ b/jps/jps-launcher/jps-launcher.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/jps/model-api/jps-model-api.iml
+++ b/jps/model-api/jps-model-api.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="annotations" />
    <orderEntry type="module" module-name="util-rt" />
--- a/jps/model-impl/jps-model-impl.iml
+++ b/jps/model-impl/jps-model-impl.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="util" />
    <orderEntry type="module" module-name="jps-model-api" />
--- a/jps/model-serialization/jps-model-serialization.iml
+++ b/jps/model-serialization/jps-model-serialization.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="util" />
    <orderEntry type="module" module-name="jps-model-api" />
--- a/jps/plugin-system/jps-plugin-system.iml
+++ b/jps/plugin-system/jps-plugin-system.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="jps-model-impl" />
    <orderEntry type="module" module-name="util" />
--- a/jps/standalone-builder/jps-standalone-builder.iml
+++ b/jps/standalone-builder/jps-standalone-builder.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="Groovy" level="project" />
    <orderEntry type="module" module-name="jps-builders" />
--- a/platform/annotations/annotations.iml
+++ b/platform/annotations/annotations.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/java5/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="annotations-common" exported="" />
  </component>
--- a/platform/annotations/common/annotations-common.iml
+++ b/platform/annotations/common/annotations-common.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/platform/boot/boot.iml
+++ b/platform/boot/boot.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
  </component>
  <component name="copyright">
    <Base>
--- a/platform/bootstrap/bootstrap.iml
+++ b/platform/bootstrap/bootstrap.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="util" />
  </component>
--- a/platform/core-api/core-api.iml
+++ b/platform/core-api/core-api.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="util" exported="" />
    <orderEntry type="module" module-name="extensions" exported="" />
--- a/platform/core-impl/core-impl.iml
+++ b/platform/core-impl/core-impl.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="core-api" exported="" />
    <orderEntry type="library" name="picocontainer" level="project" />
--- a/platform/extensions/extensions.iml
+++ b/platform/extensions/extensions.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" exported="" name="XStream" level="project" />
    <orderEntry type="library" exported="" name="JDOM" level="project" />
--- a/platform/external-system-rt/external-system-rt.iml
+++ b/platform/external-system-rt/external-system-rt.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="annotations" />
  </component>
--- a/platform/forms_rt/forms_rt.iml
+++ b/platform/forms_rt/forms_rt.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
  <component name="copyright">
--- a/platform/platform-resources-en/platform-resources-en.iml
+++ b/platform/platform-resources-en/platform-resources-en.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/platform/remote-servers/agent-rt/remote-servers-agent-rt.iml
+++ b/platform/remote-servers/agent-rt/remote-servers-agent-rt.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/platform/util-rt/util-rt.iml
+++ b/platform/util-rt/util-rt.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="annotations" />
  </component>
--- a/platform/util/util.iml
+++ b/platform/util/util.iml
@@ -7,7 +7,7 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
    <orderEntry type="library" scope="PROVIDED" name="Mac" level="project" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="JDOM" level="project" />
    <orderEntry type="library" name="Log4J" level="project" />
--- a/plugins/IntelliLang/intellilang-jps-plugin/intellilang-jps-plugin.iml
+++ b/plugins/IntelliLang/intellilang-jps-plugin/intellilang-jps-plugin.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="jps-builders" />
    <orderEntry type="module" module-name="jps-model-api" />
--- a/plugins/ant/jps-plugin/ant-jps-plugin.iml
+++ b/plugins/ant/jps-plugin/ant-jps-plugin.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="jps-model-api" />
    <orderEntry type="module" module-name="jps-model-serialization" />
--- a/plugins/coverage/coverage_rt/coverage_rt.iml
+++ b/plugins/coverage/coverage_rt/coverage_rt.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="com.intellij.coverage" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="testng_rt" />
    <orderEntry type="module" module-name="junit_rt" />
--- a/plugins/devkit/jps-plugin/devkit-jps-plugin.iml
+++ b/plugins/devkit/jps-plugin/devkit-jps-plugin.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="jps-model-api" />
    <orderEntry type="module" module-name="jps-model-serialization" />
--- a/plugins/eclipse/common-eclipse-util/common-eclipse-util.iml
+++ b/plugins/eclipse/common-eclipse-util/common-eclipse-util.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="org.jetbrains.idea.eclipse" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="util" />
    <orderEntry type="library" name="JDOM" level="project" />
--- a/plugins/eclipse/jps-plugin/eclipse-jps-plugin.iml
+++ b/plugins/eclipse/jps-plugin/eclipse-jps-plugin.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="util" />
    <orderEntry type="module" module-name="jps-model-api" />
--- a/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml
+++ b/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/testSource" isTestSource="true" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="jps-builders" />
    <orderEntry type="module" module-name="jps-model-api" />
--- a/plugins/google-app-engine/runtime/appEngine-runtime.iml
+++ b/plugins/google-app-engine/runtime/appEngine-runtime.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/source" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/plugins/gradle/jps-plugin/gradle-jps-plugin.iml
+++ b/plugins/gradle/jps-plugin/gradle-jps-plugin.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="util" />
    <orderEntry type="module" module-name="jps-builders" />
--- a/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml
+++ b/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="external-system-rt" />
    <orderEntry type="module" module-name="annotations" />
--- a/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
+++ b/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="annotations" />
    <orderEntry type="module" module-name="external-system-rt" />
--- a/plugins/groovy/jps-plugin/groovy-jps-plugin.iml
+++ b/plugins/groovy/jps-plugin/groovy-jps-plugin.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="jps-model-api" />
    <orderEntry type="module" module-name="jps-builders" />
--- a/plugins/groovy/rt-constants/groovy-rt-constants.iml
+++ b/plugins/groovy/rt-constants/groovy-rt-constants.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/plugins/groovy/rt/groovy_rt.iml
+++ b/plugins/groovy/rt/groovy_rt.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" exported="" name="Groovy" level="project" />
    <orderEntry type="module" module-name="jps-builders" />
--- a/plugins/javaFX/common-javaFX-plugin/common-javaFX-plugin.iml
+++ b/plugins/javaFX/common-javaFX-plugin/common-javaFX-plugin.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="util" />
  </component>
--- a/plugins/javaFX/javaFX-jps-plugin/javaFX-jps-plugin.iml
+++ b/plugins/javaFX/javaFX-jps-plugin/javaFX-jps-plugin.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="jps-builders" />
    <orderEntry type="module" module-name="jps-model-api" />
--- a/plugins/junit_rt/junit_rt.iml
+++ b/plugins/junit_rt/junit_rt.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="JUnit4" level="project" />
    <orderEntry type="module" module-name="java-runtime" />
--- a/plugins/maven/jps-plugin/maven-jps-plugin.iml
+++ b/plugins/maven/jps-plugin/maven-jps-plugin.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="jps-model-api" />
    <orderEntry type="module" module-name="jps-model-impl" />
--- a/plugins/testng_rt/testng_rt.iml
+++ b/plugins/testng_rt/testng_rt.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="TestNG" level="project" />
    <orderEntry type="module" module-name="java-runtime" />
--- a/plugins/ui-designer/jps-plugin/ui-designer-jps-plugin.iml
+++ b/plugins/ui-designer/jps-plugin/ui-designer-jps-plugin.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="util" />
    <orderEntry type="module" module-name="jps-model-api" />
--- a/plugins/xpath/xslt-rt/xslt-rt.iml
+++ b/plugins/xpath/xslt-rt/xslt-rt.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <excludeFolder url="file://$MODULE_DIR$/classes" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
  <component name="copyright">
--- a/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml
+++ b/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="xslt-rt" />
    <orderEntry type="module" module-name="xslt-debugger-engine" />
--- a/plugins/xslt-debugger/engine/xslt-debugger-engine.iml
+++ b/plugins/xslt-debugger/engine/xslt-debugger-engine.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="xslt-rt" />
    <orderEntry type="module-library">
--- a/resources-en/resources-en.iml
+++ b/resources-en/resources-en.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>