From 4da4de11047ed4a881773d8c1a6ee4e29d263d1f Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Fri, 20 Jan 2017 23:18:27 +0300
Subject: [PATCH] Replace kotlin-runtime with kotlin-stdlib, where it was used
 as a dependency.

---
 .../kotlin-jsr223-daemon-local-eval-example/pom.xml      | 2 +-
 libraries/examples/kotlin-jsr223-local-example/pom.xml   | 2 +-
 libraries/kotlin.test/pom.xml                            | 5 -----
 libraries/tools/kotlin-compiler-embeddable/pom.xml       | 9 ---------
 .../src/it/test-accessToInternal/pom.xml                 | 2 +-
 .../src/it/test-allopen-simple/pom.xml                   | 2 +-
 .../src/it/test-allopen-spring/pom.xml                   | 2 +-
 .../src/it/test-classpath/pom.xml                        | 2 +-
 .../src/it/test-customJdk/pom.xml                        | 2 +-
 .../src/it/test-extraArguments/pom.xml                   | 2 +-
 .../src/it/test-helloworld/pom.xml                       | 2 +-
 .../src/it/test-jvmTarget/pom.xml                        | 2 +-
 .../src/it/test-moduleName/pom.xml                       | 2 +-
 .../src/it/test-moduleNameDefault/pom.xml                | 2 +-
 .../src/it/test-noarg-jpa/pom.xml                        | 2 +-
 .../src/it/test-noarg-simple/pom.xml                     | 2 +-
 .../src/it/test-suppressWarnings/pom.xml                 | 2 +-
 17 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/pom.xml b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/pom.xml
index 3aedf1ec2ad..f618a3a0e75 100644
--- a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/pom.xml
+++ b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/pom.xml
@@ -24,7 +24,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/libraries/examples/kotlin-jsr223-local-example/pom.xml b/libraries/examples/kotlin-jsr223-local-example/pom.xml
index 8d309ab5eed..990bfdaa6ca 100644
--- a/libraries/examples/kotlin-jsr223-local-example/pom.xml
+++ b/libraries/examples/kotlin-jsr223-local-example/pom.xml
@@ -24,7 +24,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/libraries/kotlin.test/pom.xml b/libraries/kotlin.test/pom.xml
index fea28e95f65..b3d72a0285a 100644
--- a/libraries/kotlin.test/pom.xml
+++ b/libraries/kotlin.test/pom.xml
@@ -23,11 +23,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-runtime</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-stdlib</artifactId>
diff --git a/libraries/tools/kotlin-compiler-embeddable/pom.xml b/libraries/tools/kotlin-compiler-embeddable/pom.xml
index 8a88a6271a6..ff22e137e10 100644
--- a/libraries/tools/kotlin-compiler-embeddable/pom.xml
+++ b/libraries/tools/kotlin-compiler-embeddable/pom.xml
@@ -29,11 +29,6 @@
             <artifactId>kotlin-compiler</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-reflect</artifactId>
@@ -125,10 +120,6 @@
                             <createSourcesJar>true</createSourcesJar>
                             <filters>
                                 <filter>
-                                    <artifact>*:kotlin-runtime</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/**</exclude>
-                                    </excludes>
                                     <artifact>*:kotlin-reflect</artifact>
                                     <excludes>
                                         <exclude>META-INF/**</exclude>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-accessToInternal/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-accessToInternal/pom.xml
index 34cbc8205b1..fb0fda96f2a 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-accessToInternal/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-accessToInternal/pom.xml
@@ -16,7 +16,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-allopen-simple/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-allopen-simple/pom.xml
index 2ef7cca6d42..4fb564d2a9e 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-allopen-simple/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-allopen-simple/pom.xml
@@ -16,7 +16,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-allopen-spring/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-allopen-spring/pom.xml
index 46eff7616d8..6bbf92cf5dc 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-allopen-spring/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-allopen-spring/pom.xml
@@ -16,7 +16,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/pom.xml
index 1b107d16e9d..40e78cead42 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/pom.xml
@@ -16,7 +16,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-customJdk/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-customJdk/pom.xml
index aacc9e40031..5e0daa90581 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-customJdk/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-customJdk/pom.xml
@@ -16,7 +16,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-extraArguments/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-extraArguments/pom.xml
index 89fed0c33ad..3018dfad556 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-extraArguments/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-extraArguments/pom.xml
@@ -16,7 +16,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/pom.xml
index 3888a23979c..7e9232fc56d 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-helloworld/pom.xml
@@ -16,7 +16,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-jvmTarget/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-jvmTarget/pom.xml
index ef1138a71c4..7174a89e791 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-jvmTarget/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-jvmTarget/pom.xml
@@ -16,7 +16,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleName/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleName/pom.xml
index 7b588f00116..8d9c863f94a 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleName/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleName/pom.xml
@@ -16,7 +16,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleNameDefault/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleNameDefault/pom.xml
index f0282b86a1d..7afe5818d16 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleNameDefault/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-moduleNameDefault/pom.xml
@@ -16,7 +16,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-noarg-jpa/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-noarg-jpa/pom.xml
index 0ba70c88cad..e463bbf2f51 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-noarg-jpa/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-noarg-jpa/pom.xml
@@ -16,7 +16,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-noarg-simple/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-noarg-simple/pom.xml
index 2327af3c3c5..86c960ec707 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-noarg-simple/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-noarg-simple/pom.xml
@@ -16,7 +16,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/pom.xml
index be72b28df5c..9c40613b0fd 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/pom.xml
@@ -16,7 +16,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-runtime</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
     </dependencies>