From 0097e14ba19f3a3a05ee305b7036b8d95b37f636 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Thu, 13 Oct 2016 12:52:40 +0300
Subject: [PATCH] Fix test dependencies for gradle integration tests

---
 libraries/pom.xml                              |  8 +++++---
 .../pom.xml                                    | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/libraries/pom.xml b/libraries/pom.xml
index 340b02a982e..56b912fb18f 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -91,7 +91,7 @@
 
         <module>tools/binary-compatibility-validator</module>
 
-        <!--NB! kotlin-js-library should be built before kotlin-gradle-plugin-->
+        <!--NB! kotlin-js-library should be built before kotlin-gradle-plugin-integration-tests-->
         <!--because it is used in tests but cannot be added as test-dependency-->
         <!--(kotlin-gradle-plugin module will be recognized as kotlin-js module)-->
         <module>tools/idl2k</module>
@@ -99,14 +99,14 @@
         <module>tools/kotlin-js-tests</module>
         <module>tools/kotlin-js-tests-junit</module>
         <module>tools/kotlin-annotation-processing</module>
-        <module>examples/annotation-processor-example</module>
+
         <module>tools/kotlin-gradle-plugin</module>
-        <module>tools/kotlin-gradle-plugin-integration-tests</module>
         <module>tools/kotlin-gradle-plugin-api</module>
         <module>tools/kotlin-android-extensions</module>
         <module>tools/kotlin-maven-plugin-test</module>
         <module>tools/kotlin-script-util</module>
 
+        <module>examples/annotation-processor-example</module>
         <module>examples/kotlin-java-example</module>
         <module>examples/js-example</module>
         <module>examples/kotlin-js-library-example</module>
@@ -116,6 +116,8 @@
         <module>examples/kotlin-jsr223-local-example</module>
         <module>examples/kotlin-jsr223-daemon-local-eval-example</module>
         <module>examples/kotlin-jsr223-daemon-remote-eval-example</module>
+
+        <module>tools/kotlin-gradle-plugin-integration-tests</module>
     </modules>
 
     <dependencies>
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/pom.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/pom.xml
index 85bb9193109..dcabd0d4a54 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/pom.xml
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/pom.xml
@@ -26,6 +26,24 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>annotation-processor-example</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-android-extensions</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-js-library</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-gradle-plugin</artifactId>