From d0e917e7f9eff648d6f5a163b548ae98d0650c50 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 26 Jan 2017 00:21:21 +0300
Subject: [PATCH] Fix maven references to stdlib-js in IDEA project #KT-15940

---
 .../testData/configurator/js/libraryMissed/pom_after.xml      | 2 +-
 idea/idea-maven/testData/configurator/js/pluginMissed/pom.xml | 2 +-
 .../testData/configurator/js/pluginMissed/pom_after.xml       | 2 +-
 .../testData/configurator/js/simpleProject/pom_after.xml      | 2 +-
 .../configurator/js/simpleProjectSnapshot/pom_after.xml       | 2 +-
 .../maven-inspections/dependencyWithNoExecution.fixed.1.xml   | 4 ++--
 .../maven-inspections/dependencyWithNoExecution.fixed.2.xml   | 4 ++--
 .../testData/maven-inspections/dependencyWithNoExecution.xml  | 4 ++--
 .../maven-inspections/missingDependencies.fixed.1.xml         | 2 +-
 .../maven-inspections/missingDependencies.fixed.2.xml         | 4 ++--
 .../testData/maven-inspections/missingDependencies.xml        | 2 +-
 .../testData/maven-inspections/wrongJsExecution.xml           | 2 +-
 .../kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt          | 2 +-
 idea/testData/configuration/gradle/js_after.gradle            | 2 +-
 14 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/idea/idea-maven/testData/configurator/js/libraryMissed/pom_after.xml b/idea/idea-maven/testData/configurator/js/libraryMissed/pom_after.xml
index 0654d642da1..fe61b1a44db 100644
--- a/idea/idea-maven/testData/configurator/js/libraryMissed/pom_after.xml
+++ b/idea/idea-maven/testData/configurator/js/libraryMissed/pom_after.xml
@@ -40,7 +40,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/idea/idea-maven/testData/configurator/js/pluginMissed/pom.xml b/idea/idea-maven/testData/configurator/js/pluginMissed/pom.xml
index 4dc874818b3..6ced6f560c7 100644
--- a/idea/idea-maven/testData/configurator/js/pluginMissed/pom.xml
+++ b/idea/idea-maven/testData/configurator/js/pluginMissed/pom.xml
@@ -13,7 +13,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/idea/idea-maven/testData/configurator/js/pluginMissed/pom_after.xml b/idea/idea-maven/testData/configurator/js/pluginMissed/pom_after.xml
index 1663f9b457e..3a904398479 100644
--- a/idea/idea-maven/testData/configurator/js/pluginMissed/pom_after.xml
+++ b/idea/idea-maven/testData/configurator/js/pluginMissed/pom_after.xml
@@ -13,7 +13,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/idea/idea-maven/testData/configurator/js/simpleProject/pom_after.xml b/idea/idea-maven/testData/configurator/js/simpleProject/pom_after.xml
index 52d76362e2b..a079a9a0dcb 100644
--- a/idea/idea-maven/testData/configurator/js/simpleProject/pom_after.xml
+++ b/idea/idea-maven/testData/configurator/js/simpleProject/pom_after.xml
@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/idea/idea-maven/testData/configurator/js/simpleProjectSnapshot/pom_after.xml b/idea/idea-maven/testData/configurator/js/simpleProjectSnapshot/pom_after.xml
index 1a36d9599b0..306bebc3496 100644
--- a/idea/idea-maven/testData/configurator/js/simpleProjectSnapshot/pom_after.xml
+++ b/idea/idea-maven/testData/configurator/js/simpleProjectSnapshot/pom_after.xml
@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.fixed.1.xml b/idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.fixed.1.xml
index c98a0ae9072..8f6d1b6af9f 100644
--- a/idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.fixed.1.xml
+++ b/idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.fixed.1.xml
@@ -20,7 +20,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
@@ -48,4 +48,4 @@
 </project>
 
 <!-- problem: on kotlin-stdlib, title You have kotlin-stdlib configured but no corresponding plugin execution -->
-<!-- problem: on kotlin-js-library, title You have kotlin-js-library configured but no corresponding plugin execution -->
+<!-- problem: on kotlin-stdlib-js, title You have kotlin-stdlib-js configured but no corresponding plugin execution -->
diff --git a/idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.fixed.2.xml b/idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.fixed.2.xml
index 5821d022c5f..5cb4cae548e 100644
--- a/idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.fixed.2.xml
+++ b/idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.fixed.2.xml
@@ -20,7 +20,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
@@ -48,4 +48,4 @@
 </project>
 
 <!-- problem: on kotlin-stdlib, title You have kotlin-stdlib configured but no corresponding plugin execution -->
-<!-- problem: on kotlin-js-library, title You have kotlin-js-library configured but no corresponding plugin execution -->
+<!-- problem: on kotlin-stdlib-js, title You have kotlin-stdlib-js configured but no corresponding plugin execution -->
diff --git a/idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.xml b/idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.xml
index d0c18d857a1..77f1f601555 100644
--- a/idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.xml
+++ b/idea/idea-maven/testData/maven-inspections/dependencyWithNoExecution.xml
@@ -20,11 +20,11 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
 </project>
 
 <!-- problem: on kotlin-stdlib, title You have kotlin-stdlib configured but no corresponding plugin execution -->
-<!-- problem: on kotlin-js-library, title You have kotlin-js-library configured but no corresponding plugin execution -->
+<!-- problem: on kotlin-stdlib-js, title You have kotlin-stdlib-js configured but no corresponding plugin execution -->
diff --git a/idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.1.xml b/idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.1.xml
index ce01232550d..6d5a2e855f6 100644
--- a/idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.1.xml
+++ b/idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.1.xml
@@ -41,4 +41,4 @@
 </project>
 
 <!-- problem: on kotlin-maven-plugin, title Kotlin JVM compiler configured but no kotlin-stdlib dependency -->
-<!-- problem: on kotlin-maven-plugin, title Kotlin JavaScript compiler configured but no kotlin-js-library dependency -->
+<!-- problem: on kotlin-maven-plugin, title Kotlin JavaScript compiler configured but no kotlin-stdlib-js dependency -->
diff --git a/idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.2.xml b/idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.2.xml
index 209e312e947..c9f40196ad6 100644
--- a/idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.2.xml
+++ b/idea/idea-maven/testData/maven-inspections/missingDependencies.fixed.2.xml
@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
@@ -41,4 +41,4 @@
 </project>
 
 <!-- problem: on kotlin-maven-plugin, title Kotlin JVM compiler configured but no kotlin-stdlib dependency -->
-<!-- problem: on kotlin-maven-plugin, title Kotlin JavaScript compiler configured but no kotlin-js-library dependency -->
+<!-- problem: on kotlin-maven-plugin, title Kotlin JavaScript compiler configured but no kotlin-stdlib-js dependency -->
diff --git a/idea/idea-maven/testData/maven-inspections/missingDependencies.xml b/idea/idea-maven/testData/maven-inspections/missingDependencies.xml
index b01241c7a13..78c46f01a5a 100644
--- a/idea/idea-maven/testData/maven-inspections/missingDependencies.xml
+++ b/idea/idea-maven/testData/maven-inspections/missingDependencies.xml
@@ -33,4 +33,4 @@
 </project>
 
 <!-- problem: on kotlin-maven-plugin, title Kotlin JVM compiler configured but no kotlin-stdlib dependency -->
-<!-- problem: on kotlin-maven-plugin, title Kotlin JavaScript compiler configured but no kotlin-js-library dependency -->
+<!-- problem: on kotlin-maven-plugin, title Kotlin JavaScript compiler configured but no kotlin-stdlib-js dependency -->
diff --git a/idea/idea-maven/testData/maven-inspections/wrongJsExecution.xml b/idea/idea-maven/testData/maven-inspections/wrongJsExecution.xml
index 2936951187c..10057391767 100644
--- a/idea/idea-maven/testData/maven-inspections/wrongJsExecution.xml
+++ b/idea/idea-maven/testData/maven-inspections/wrongJsExecution.xml
@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
index efb7dad27fc..014352e9357 100644
--- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
@@ -303,5 +303,5 @@ fun getStdlibArtifactId(sdk: Sdk?): String {
 val MAVEN_STDLIB_ID = "kotlin-stdlib"
 val MAVEN_STDLIB_ID_JRE7 = "kotlin-stdlib-jre7"
 val MAVEN_STDLIB_ID_JRE8 = "kotlin-stdlib-jre8"
-val MAVEN_JS_STDLIB_ID = "kotlin-js-library"
+val MAVEN_JS_STDLIB_ID = "kotlin-stdlib-js"
 val MAVEN_COMMON_STDLIB_ID = "kotlin-stdlib-common" // TODO: KotlinCommonMavenConfigurator
diff --git a/idea/testData/configuration/gradle/js_after.gradle b/idea/testData/configuration/gradle/js_after.gradle
index d535b0cf238..9b911138e3d 100644
--- a/idea/testData/configuration/gradle/js_after.gradle
+++ b/idea/testData/configuration/gradle/js_after.gradle
@@ -14,5 +14,5 @@ buildscript {
 }
 apply plugin: 'kotlin2js'
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
 }