From ea9be01034a05ce1dee3e6eb92bb25b025c4c16f Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 25 Jan 2017 23:27:01 +0300
Subject: [PATCH] Fix maven references to stdlib-js #KT-15940

---
 .../browser-example-with-library/pom.xml      |  4 +--
 libraries/examples/browser-example/pom.xml    |  4 +--
 libraries/examples/js-example/pom.xml         |  2 +-
 .../kotlin-js-library-example/pom.xml         |  2 +-
 libraries/kotlin.test/js/pom.xml              |  2 +-
 libraries/kotlin.test/pom.xml                 |  2 +-
 .../kotlin2JsModuleKind/build.gradle          |  2 +-
 .../kotlin2JsNoOutputFileProject/build.gradle |  2 +-
 .../libraryProject/build.gradle               |  2 +-
 .../kotlin2JsProject/mainProject/build.gradle |  2 +-
 .../kotlin2JsProjectWithTests/build.gradle    |  2 +-
 libraries/tools/kotlin-js-tests-junit/pom.xml |  2 +-
 libraries/tools/kotlin-js-tests/pom.xml       |  4 +--
 .../tools/kotlin-maven-plugin-test/pom.xml    |  2 +-
 .../src/it/test-js-extraArguments/pom.xml     |  2 +-
 .../src/it/test-js-moduleKind/pom.xml         |  4 +--
 .../src/it/test-js-suppressWarnings/pom.xml   |  2 +-
 .../src/it/test-multiplatform/js/pom.xml      |  2 +-
 .../resources/archetype-resources/pom.xml     |  4 +--
 libraries/tools/pom.xml                       | 28 -------------------
 20 files changed, 24 insertions(+), 52 deletions(-)
 delete mode 100644 libraries/tools/pom.xml

diff --git a/libraries/examples/browser-example-with-library/pom.xml b/libraries/examples/browser-example-with-library/pom.xml
index 34c21b4e6ac..7c11be5c319 100644
--- a/libraries/examples/browser-example-with-library/pom.xml
+++ b/libraries/examples/browser-example-with-library/pom.xml
@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -95,7 +95,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.jetbrains.kotlin</groupId>
-                                    <artifactId>kotlin-js-library</artifactId>
+                                    <artifactId>kotlin-stdlib-js</artifactId>
                                     <version>${project.version}</version>
                                     <outputDirectory>${project.build.directory}/js/lib</outputDirectory>
                                     <includes>*.js</includes>
diff --git a/libraries/examples/browser-example/pom.xml b/libraries/examples/browser-example/pom.xml
index 6abbcc7e898..9ad823c34ba 100644
--- a/libraries/examples/browser-example/pom.xml
+++ b/libraries/examples/browser-example/pom.xml
@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -90,7 +90,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.jetbrains.kotlin</groupId>
-                                    <artifactId>kotlin-js-library</artifactId>
+                                    <artifactId>kotlin-stdlib-js</artifactId>
                                     <version>${project.version}</version>
                                     <outputDirectory>${project.build.directory}/js/lib</outputDirectory>
                                     <includes>*.js</includes>
diff --git a/libraries/examples/js-example/pom.xml b/libraries/examples/js-example/pom.xml
index 7070b5a3215..ca91a680a66 100644
--- a/libraries/examples/js-example/pom.xml
+++ b/libraries/examples/js-example/pom.xml
@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/libraries/examples/kotlin-js-library-example/pom.xml b/libraries/examples/kotlin-js-library-example/pom.xml
index 46b02283c4a..ea7a160c3e4 100644
--- a/libraries/examples/kotlin-js-library-example/pom.xml
+++ b/libraries/examples/kotlin-js-library-example/pom.xml
@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/libraries/kotlin.test/js/pom.xml b/libraries/kotlin.test/js/pom.xml
index 24824500cab..c4e568ea8f3 100644
--- a/libraries/kotlin.test/js/pom.xml
+++ b/libraries/kotlin.test/js/pom.xml
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
diff --git a/libraries/kotlin.test/pom.xml b/libraries/kotlin.test/pom.xml
index b3d72a0285a..ce485e2cf76 100644
--- a/libraries/kotlin.test/pom.xml
+++ b/libraries/kotlin.test/pom.xml
@@ -35,7 +35,7 @@
             </dependency>
             <dependency>
                 <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-js-library</artifactId>
+                <artifactId>kotlin-stdlib-js</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsModuleKind/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsModuleKind/build.gradle
index 172a074e8b0..ee711a29062 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsModuleKind/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsModuleKind/build.gradle
@@ -22,7 +22,7 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
     compile "org.mozilla:rhino:1.7.7.1"
 }
 
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle
index d748c781898..167c6ef9794 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle
@@ -14,5 +14,5 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle
index c9ea9d333de..c302a41c3b1 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
 }
 
 task jarSources(type: Jar) {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle
index 81b1499d9b9..e00e0d4ffec 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
     compile project(":libraryProject")
-    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
 }
 
 compileKotlin2Js.kotlinOptions.sourceMap = true
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithTests/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithTests/build.gradle
index 514c141ab5c..27fe562dc9a 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithTests/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithTests/build.gradle
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
 }
 
 task jarSources(type: Jar) {
diff --git a/libraries/tools/kotlin-js-tests-junit/pom.xml b/libraries/tools/kotlin-js-tests-junit/pom.xml
index 1e729746416..244717b4733 100644
--- a/libraries/tools/kotlin-js-tests-junit/pom.xml
+++ b/libraries/tools/kotlin-js-tests-junit/pom.xml
@@ -33,7 +33,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.jetbrains.kotlin</groupId>
-                    <artifactId>kotlin-js-library</artifactId>
+                    <artifactId>kotlin-stdlib-js</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
diff --git a/libraries/tools/kotlin-js-tests/pom.xml b/libraries/tools/kotlin-js-tests/pom.xml
index cbb41f3ca26..ccfa57d6d86 100644
--- a/libraries/tools/kotlin-js-tests/pom.xml
+++ b/libraries/tools/kotlin-js-tests/pom.xml
@@ -18,7 +18,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -109,7 +109,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.jetbrains.kotlin</groupId>
-                                    <artifactId>kotlin-js-library</artifactId>
+                                    <artifactId>kotlin-stdlib-js</artifactId>
                                     <version>${project.version}</version>
                                     <outputDirectory>${project.build.directory}/js/lib</outputDirectory>
                                     <includes>*.js</includes>
diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml
index fb458eb1fda..1c4c58d8893 100644
--- a/libraries/tools/kotlin-maven-plugin-test/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/pom.xml
index 4e8ec20c64d..cd76cc78c49 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-extraArguments/pom.xml
@@ -11,7 +11,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/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/pom.xml
index 14ca5df6ac6..35d972b074a 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/pom.xml
@@ -11,7 +11,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
@@ -50,7 +50,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.jetbrains.kotlin</groupId>
-                                    <artifactId>kotlin-js-library</artifactId>
+                                    <artifactId>kotlin-stdlib-js</artifactId>
                                     <version>${kotlin.version}</version>
                                     <type>jar</type>
                                     <overWrite>false</overWrite>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/pom.xml
index 23a2678ba2f..e8752b1d4d3 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/pom.xml
@@ -11,7 +11,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/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/pom.xml
index 9e2570c831e..5e8cfe0c698 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/js/pom.xml
@@ -16,7 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
         <dependency>
diff --git a/libraries/tools/maven-archetypes/kotlin-archetype-js/src/main/resources/archetype-resources/pom.xml b/libraries/tools/maven-archetypes/kotlin-archetype-js/src/main/resources/archetype-resources/pom.xml
index 4f8f1d6f2c5..4b9f4f52cbb 100644
--- a/libraries/tools/maven-archetypes/kotlin-archetype-js/src/main/resources/archetype-resources/pom.xml
+++ b/libraries/tools/maven-archetypes/kotlin-archetype-js/src/main/resources/archetype-resources/pom.xml
@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
+            <artifactId>kotlin-stdlib-js</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
@@ -59,7 +59,7 @@
                             <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
-                            <includeArtifactIds>kotlin-js-library</includeArtifactIds>
+                            <includeArtifactIds>kotlin-stdlib-js</includeArtifactIds>
                             <outputDirectory>${build.outputDirectory}/lib</outputDirectory>
                             <includes>**\/*.js</includes>
                             <excludes>**\/*.meta.js</excludes> <!-- we don't need meta.js files in runtime -->
diff --git a/libraries/tools/pom.xml b/libraries/tools/pom.xml
deleted file mode 100644
index 3f9620b910e..00000000000
--- a/libraries/tools/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-project</artifactId>
-        <version>1.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>kotlin-js-tools</artifactId>
-    <packaging>pom</packaging>
-
-    <description>
-        A project to make it easier to compile and test the JS standard library as a single, repeatable build
-    </description>
-
-    <modules>
-        <module>kotlin-js-library</module>
-        <module>kotlin-js-tests</module>
-        <module>kotlin-js-tests-junit</module>
-    </modules>
-
-</project>