From 50e3e012845ab424881984ed1f656ab9777d8f9f Mon Sep 17 00:00:00 2001
From: Leonid Shalupov <shalupov@diverse.org.ru>
Date: Wed, 4 Apr 2012 15:42:54 +0400
Subject: [PATCH] no dependency on external maven plugin

---
 libraries/kdoc/pom.xml                | 45 +++++++++++++++++
 libraries/kotlin-java/pom.xml         |  3 --
 libraries/kotlin-jdbc/pom.xml         | 32 ++++++++++++
 libraries/kotlin-maven-plugin/pom.xml | 17 ++++---
 libraries/kunit/pom.xml               | 37 +++++++++++++-
 libraries/pom.xml                     | 73 ++-------------------------
 libraries/runtime/pom.xml             | 40 +++++++++++++++
 libraries/stdlib/pom.xml              | 51 ++++++++-----------
 8 files changed, 189 insertions(+), 109 deletions(-)
 create mode 100644 libraries/runtime/pom.xml

diff --git a/libraries/kdoc/pom.xml b/libraries/kdoc/pom.xml
index 3e5744dd23f..32513db3b75 100644
--- a/libraries/kdoc/pom.xml
+++ b/libraries/kdoc/pom.xml
@@ -19,5 +19,50 @@
             <artifactId>pegdown</artifactId>
             <version>${pegdown.version}</version>
         </dependency>
+
+        <!-- TODO Replace with compiler dependency -->
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-maven-plugin</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>stdlib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
+
+    <build>
+        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
+        <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
+
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${project.version}</version>
+
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/libraries/kotlin-java/pom.xml b/libraries/kotlin-java/pom.xml
index 9f9ba9abab5..1ded3cf61a8 100644
--- a/libraries/kotlin-java/pom.xml
+++ b/libraries/kotlin-java/pom.xml
@@ -22,9 +22,6 @@
     </dependencies>
 
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/libraries/kotlin-jdbc/pom.xml b/libraries/kotlin-jdbc/pom.xml
index 8aa7962b574..1fd3d33dc42 100644
--- a/libraries/kotlin-jdbc/pom.xml
+++ b/libraries/kotlin-jdbc/pom.xml
@@ -19,6 +19,7 @@
             <artifactId>stdlib</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -26,4 +27,35 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
+        <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
+
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${project.version}</version>
+
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/libraries/kotlin-maven-plugin/pom.xml b/libraries/kotlin-maven-plugin/pom.xml
index 8e351d9f45a..9ad52cdd1a3 100644
--- a/libraries/kotlin-maven-plugin/pom.xml
+++ b/libraries/kotlin-maven-plugin/pom.xml
@@ -24,6 +24,7 @@
             <artifactId>maven-plugin-api</artifactId>
             <version>${maven.version}</version>
         </dependency>
+
         <!--
                 <dependency>
                     <groupId>org.apache.maven</groupId>
@@ -32,11 +33,6 @@
                 </dependency>
         -->
 
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>stdlib</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-compiler</artifactId>
@@ -44,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-build-tools</artifactId>
+            <artifactId>runtime</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -58,6 +54,14 @@
             <version>${project.version}</version>
         </dependency>
 
+        <!-- TODO Req. only for K2JSTranslator, move it to compiler -->
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-build-tools</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!-- Shall be transitive dependencies of Kotlin compiler -->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -132,6 +136,7 @@
                 <version>2.9</version>
             </plugin>
 
+            <!-- Get rid of it right after compiler careful packaging -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
diff --git a/libraries/kunit/pom.xml b/libraries/kunit/pom.xml
index e8b63a5ff57..494ef7a6df9 100644
--- a/libraries/kunit/pom.xml
+++ b/libraries/kunit/pom.xml
@@ -13,9 +13,42 @@
 
     <artifactId>kunit</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>runtime</artifactId>
+            <version>${project.version}</version>
+
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit-version}</version>
+        </dependency>
+    </dependencies>
+
     <build>
-        <sourceDirectory>${project.basedir}/src</sourceDirectory>
-        <testSourceDirectory>${project.basedir}/test</testSourceDirectory>
+        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
+        <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
+
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${project.version}</version>
+
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 
 </project>
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 6b6570d036e..d4a33c58bd7 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -27,50 +27,30 @@
         <surefire-version>2.5</surefire-version>
     </properties>
 
-
-    <repositories>
-        <repository>
-            <id>evgenyg.artifactoryonline.com</id>
-            <url>http://evgenyg.artifactoryonline.com/evgenyg/repo/</url>
-        </repository>
-    </repositories>
-
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>evgenyg.artifactoryonline.com</id>
-            <url>http://evgenyg.artifactoryonline.com/evgenyg/repo/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-
     <modules>
         <module>kotlin-install</module>
+        <module>runtime</module>
+        <module>kotlin-maven-plugin</module>
         <module>kunit</module>
         <module>stdlib</module>
         <module>kdoc</module>
         <module>kotlin-jdbc</module>
-        <module>website</module>
         <module>kotlin-java</module>
-        <module>kotlin-maven-plugin</module>
+        <module>website</module>
         <module>examples</module>
     </modules>
 
-
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit-version}</version>
-            <scope>compile</scope>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
 
     <build>
-        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
-        <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
-
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -86,50 +66,6 @@
         </pluginManagement>
 
         <plugins>
-            <plugin>
-                <groupId>com.github.goldin</groupId>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <version>${kotlin-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>compile-kotlin-sources</id>
-                        <goals>
-                            <goal>compile</goal>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <runIf>{{ new File( project.build.sourceDirectory ).directory }}</runIf>
-                    <verbose>false</verbose>
-                    <kotlinJars>
-                        <jar>${kotlin-sdk}/lib/kotlin-build-tools.jar</jar>
-                        <jar>${kotlin-sdk}/lib/kotlin-compiler.jar</jar>
-                        <jar>${kotlin-sdk}/lib/kotlin-runtime.jar</jar>
-                        <jar>${kotlin-sdk}/lib/intellij-core.jar</jar>
-                        <jar>${kotlin-sdk}/lib/picocontainer.jar</jar>
-                        <jar>${kotlin-sdk}/lib/trove4j.jar</jar>
-                        <jar>${kotlin-sdk}/lib/guava-11.0.1.jar</jar>
-                        <jar>${kotlin-sdk}/lib/asm-commons.jar</jar>
-                        <jar>${kotlin-sdk}/lib/asm.jar</jar>
-                    </kotlinJars>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>${maven-jar-plugin.version}</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire-version}</version>
@@ -150,5 +86,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/libraries/runtime/pom.xml b/libraries/runtime/pom.xml
new file mode 100644
index 00000000000..4a78222c66c
--- /dev/null
+++ b/libraries/runtime/pom.xml
@@ -0,0 +1,40 @@
+<?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.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>runtime</artifactId>
+    <packaging>jar</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.7</version>
+                <executions>
+                    <!-- Use precompiled class files -->
+                    <execution>
+                        <phase>compile</phase>
+                        <configuration>
+                            <tasks>
+                                <unzip src="${kotlin-sdk}/lib/kotlin-runtime.jar"
+                                       dest="${project.build.outputDirectory}"/>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/libraries/stdlib/pom.xml b/libraries/stdlib/pom.xml
index 7805912517d..f7005908f28 100644
--- a/libraries/stdlib/pom.xml
+++ b/libraries/stdlib/pom.xml
@@ -14,6 +14,12 @@
     <artifactId>stdlib</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>runtime</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kunit</artifactId>
@@ -22,40 +28,11 @@
         </dependency>
     </dependencies>
 
-
     <build>
         <sourceDirectory>${project.basedir}/src</sourceDirectory>
         <testSourceDirectory>${project.basedir}/test</testSourceDirectory>
 
         <plugins>
-
-            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-            <!-- Unpacking "kotlin-runtime.jar" to ${project.build.outputDirectory} -->
-            <!-- so that its content is packed together with our jar                -->
-            <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-
-            <plugin>
-                <groupId>com.github.goldin</groupId>
-                <artifactId>copy-maven-plugin</artifactId>
-                <version>0.2.3.8</version>
-                <executions>
-                    <execution>
-                        <id>unpack-kotlin-runtime</id>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <phase>initialize</phase>
-                        <configuration>
-                            <resource>
-                                <targetPath>${project.build.outputDirectory}</targetPath>
-                                <file>${kotlin-sdk}/lib/kotlin-runtime.jar</file>
-                                <unpack>true</unpack>
-                            </resource>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
@@ -72,6 +49,22 @@
                     <classpathScope>test</classpathScope>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${project.version}</version>
+
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>