From eced3003adb1acf175b12d8bd61b9c5719cd3de8 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 17 Feb 2015 16:26:28 +0300
Subject: [PATCH] Introduce kotlin-reflect Maven artifact

---
 Kotlin.iml                                    |  1 +
 .../parsing/JetCodeConformanceTest.java       |  7 +-
 libraries/pom.xml                             | 10 +--
 libraries/tools/kotlin-reflect/pom.xml        | 71 +++++++++++++++++++
 libraries/tools/runtime/pom.xml               |  1 -
 5 files changed, 82 insertions(+), 8 deletions(-)
 create mode 100644 libraries/tools/kotlin-reflect/pom.xml

diff --git a/Kotlin.iml b/Kotlin.iml
index 4278f5e1940..e54fb89ad69 100644
--- a/Kotlin.iml
+++ b/Kotlin.iml
@@ -40,6 +40,7 @@
       <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin-test/target" />
       <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin/local-repo" />
       <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-maven-plugin/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-reflect/target" />
       <excludeFolder url="file://$MODULE_DIR$/libraries/tools/kotlin-stdlib-gen/target" />
       <excludeFolder url="file://$MODULE_DIR$/libraries/tools/runtime/target" />
     </content>
diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java b/compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java
index 10f0e887c81..fd4a81063ca 100644
--- a/compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java
@@ -37,7 +37,7 @@ public class JetCodeConformanceTest extends TestCase {
     private static final List<File> EXCLUDED_FILES_AND_DIRS = Arrays.asList(
             new File("android.tests.dependencies"),
             new File("core/reflection.jvm/src/kotlin/reflect/jvm/internal/pcollections"),
-            new File("libraries/tools/runtime/target/copied-sources"),
+            new File("libraries/tools/kotlin-reflect/target/copied-sources"),
             new File("dependencies"),
             new File("js/js.translator/qunit/qunit.js"),
             new File("libraries/tools/kotlin-js-tests/src/test/web/qunit.js"),
@@ -47,7 +47,8 @@ public class JetCodeConformanceTest extends TestCase {
             new File("ideaSDK"),
             new File("libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/build/tmp"),
             new File("compiler/testData/psi/kdoc"),
-            new File("compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java"));
+            new File("compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java")
+    );
     public static final Pattern AUTHOR_JAVADOC_PATTERN = Pattern.compile("/\\*.+@author.+\\*/", Pattern.DOTALL);
 
     public void testParserCode() throws Exception {
@@ -73,7 +74,7 @@ public class JetCodeConformanceTest extends TestCase {
         });
 
         if (!filesWithAuthorJavadoc.isEmpty()) {
-            fail(String.format("%d source files contain @author javadoc tag. Please remove them:\n%s",
+            fail(String.format("%d source files contain @author javadoc tag. Please remove them or exclude in this test:\n%s",
                                filesWithAuthorJavadoc.size(), StringUtil.join(filesWithAuthorJavadoc, "\n")));
         }
     }
diff --git a/libraries/pom.xml b/libraries/pom.xml
index d2cb17df171..cac8c027cd5 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -77,7 +77,13 @@
         <module>tools/kotlin-compiler</module>
         <module>tools/kotlin-jdk-annotations</module>
         <module>tools/kotlin-android-sdk-annotations</module>
+        <module>tools/kotlin-maven-plugin</module>
+
         <module>tools/runtime</module>
+        <module>stdlib</module>
+        <module>stdlib/validator</module>
+        <module>tools/kotlin-reflect</module>
+
         <!--NB! kotlin-js-library should be built before kotlin-gradle-plugin-->
         <!--because it is used in tests but cannot be added as test-dependency-->
         <!--(kotlin-gradle-plugin module will be recognized as kotlin-js module)-->
@@ -86,16 +92,12 @@
         <module>tools/kotlin-gradle-plugin-core</module>
         <module>tools/kotlin-gradle-plugin-api</module>
         <module>tools/kotlin-android-compiler-plugin</module>
-        <module>tools/kotlin-maven-plugin</module>
         <module>tools/kotlin-maven-plugin-test</module>
         <module>tools/kotlin-js-tests</module>
         <module>tools/kotlin-js-tests-junit</module>
         <module>tools/kdoc</module>
         <module>tools/kdoc-maven-plugin</module>
 
-        <module>stdlib</module>
-        <module>stdlib/validator</module>
-
         <module>kunit</module>
         <module>kotlin-jdbc</module>
         <module>kotlin-swing</module>
diff --git a/libraries/tools/kotlin-reflect/pom.xml b/libraries/tools/kotlin-reflect/pom.xml
new file mode 100644
index 00000000000..5267871b1e0
--- /dev/null
+++ b/libraries/tools/kotlin-reflect/pom.xml
@@ -0,0 +1,71 @@
+<?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>0.1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>kotlin-reflect</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>target/copied-sources</sourceDirectory>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.7</version>
+
+                <executions>
+                    <execution>
+                        <id>copy-sources</id>
+                        <phase>process-sources</phase>
+                        <configuration>
+                            <target>
+                                <delete dir="${basedir}/target/copied-sources" failonerror="false" />
+                                <copy todir="${basedir}/target/copied-sources">
+                                    <fileset dir="${basedir}/../../../core/reflection.jvm/src"/>
+                                </copy>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${project.version}</version>
+
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/libraries/tools/runtime/pom.xml b/libraries/tools/runtime/pom.xml
index 7fde7c6a810..e8b7800415c 100644
--- a/libraries/tools/runtime/pom.xml
+++ b/libraries/tools/runtime/pom.xml
@@ -35,7 +35,6 @@
                                     <fileset dir="${basedir}/../../../core/builtins/src"/>
                                     <fileset dir="${basedir}/../../../core/runtime.jvm/src"/>
                                     <fileset dir="${basedir}/../../../core/reflection/src"/>
-                                    <fileset dir="${basedir}/../../../core/reflection.jvm/src"/>
                                 </copy>
                             </target>
                         </configuration>