From 973498033466f1bb076ac675a407f1d535d130dc Mon Sep 17 00:00:00 2001
From: Michael Nedzelsky <Michael.Nedzelsky@jetbrains.com>
Date: Sat, 8 Nov 2014 18:43:15 +0300
Subject: [PATCH] JS maven tests: fixes configuration files

---
 libraries/examples/browser-example/pom.xml    | 37 +++++++++++++----
 .../examples/browser-example/sample.html      |  2 +-
 libraries/examples/js-example/pom.xml         |  9 +----
 libraries/tools/kotlin-js-tests/pom.xml       | 40 +++++++++++++++----
 .../kotlin-js-tests/src/test/web/index.html   |  2 +-
 .../src/it/test-js-extraArguments/pom.xml     | 15 +++----
 .../src/it/test-js-suppressWarnings/pom.xml   | 15 +++----
 7 files changed, 82 insertions(+), 38 deletions(-)

diff --git a/libraries/examples/browser-example/pom.xml b/libraries/examples/browser-example/pom.xml
index 1e85fa6a62d..f034dea84ff 100644
--- a/libraries/examples/browser-example/pom.xml
+++ b/libraries/examples/browser-example/pom.xml
@@ -34,6 +34,11 @@
             <version>${selenium.version}</version>
             <scope>test</scope>
         </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-js-library</artifactId>
+                <version>${project.version}</version>
+            </dependency>
     </dependencies>
 
     <build>
@@ -46,13 +51,6 @@
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
                 <version>${project.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.jetbrains.kotlin</groupId>
-                        <artifactId>kotlin-js-library</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>js</id>
@@ -77,6 +75,31 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.jetbrains.kotlin</groupId>
+                                    <artifactId>kotlin-js-library</artifactId>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/js</outputDirectory>
+                                    <includes>*.js</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                   <artifactId>maven-deploy-plugin</artifactId>
                   <configuration>
diff --git a/libraries/examples/browser-example/sample.html b/libraries/examples/browser-example/sample.html
index 5b2d8fc333d..869440d86c5 100644
--- a/libraries/examples/browser-example/sample.html
+++ b/libraries/examples/browser-example/sample.html
@@ -9,7 +9,7 @@
 </div>
 
 <script type="text/javascript" src="src/js/jquery.js"></script>
-<script src="../../../dist/kotlin.js"></script>
+<script src="target/js/kotlin.js"></script>
 <script type="text/javascript" src="target/js/browser-example.js"></script>
 
 <!--
diff --git a/libraries/examples/js-example/pom.xml b/libraries/examples/js-example/pom.xml
index 43f2eea8d0b..d0c315cf61d 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-stdlib</artifactId>
+            <artifactId>kotlin-js-library</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
@@ -31,13 +31,6 @@
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
                 <version>${project.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.jetbrains.kotlin</groupId>
-                        <artifactId>kotlin-js-library</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>js</id>
diff --git a/libraries/tools/kotlin-js-tests/pom.xml b/libraries/tools/kotlin-js-tests/pom.xml
index 21dbf8ca09a..943bde501cc 100644
--- a/libraries/tools/kotlin-js-tests/pom.xml
+++ b/libraries/tools/kotlin-js-tests/pom.xml
@@ -15,6 +15,14 @@
     <artifactId>kotlin-js-tests</artifactId>
     <packaging>jar</packaging>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-js-library</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
     <build>
         <sourceDirectory>${basedir}/target/tests</sourceDirectory>
 
@@ -91,13 +99,6 @@
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
                 <version>${project.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.jetbrains.kotlin</groupId>
-                        <artifactId>kotlin-js-library</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>js</id>
@@ -108,6 +109,31 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.jetbrains.kotlin</groupId>
+                                    <artifactId>kotlin-js-library</artifactId>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/js</outputDirectory>
+                                    <includes>*.js</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
diff --git a/libraries/tools/kotlin-js-tests/src/test/web/index.html b/libraries/tools/kotlin-js-tests/src/test/web/index.html
index 8693123be2d..2ad5550d054 100644
--- a/libraries/tools/kotlin-js-tests/src/test/web/index.html
+++ b/libraries/tools/kotlin-js-tests/src/test/web/index.html
@@ -7,7 +7,7 @@
 
     <script src="qunit.js"></script>
 
-    <script src="../../../../../../dist/kotlin.js"></script>
+    <script src="../../../target/js/kotlin.js"></script>
     <script src="../../../target/js/kotlin-js-tests.js"></script>
 
     <script src="deepEqual.js"></script>
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 599d0addabe..9abd7eeb4b8 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
@@ -13,6 +13,14 @@
 
     <artifactId>test-js-extraArguments</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-js-library</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
         <plugins>
@@ -20,13 +28,6 @@
                 <artifactId>kotlin-maven-plugin</artifactId>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <version>${project.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.jetbrains.kotlin</groupId>
-                        <artifactId>kotlin-js-library</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>compile</id>
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 f7702193138..d99017e4fa7 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
@@ -13,6 +13,14 @@
 
     <artifactId>test-js-suppressWarningsAndVersion</artifactId>
 
+    <dependencies>
+    	<dependency>
+        	<groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-js-library</artifactId>
+                <version>${project.version}</version>
+        </dependency>
+   </dependencies>
+   
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
         <plugins>
@@ -20,13 +28,6 @@
                 <artifactId>kotlin-maven-plugin</artifactId>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <version>${project.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.jetbrains.kotlin</groupId>
-                        <artifactId>kotlin-js-library</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>compile</id>