From 9cc156c67fff49c671b0543304979ed5836cf3e9 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 28 May 2015 18:11:47 +0300
Subject: [PATCH] Copy kotlin-reflect.jar from dist to publish to Maven

Also build sources jar in build.xml to publish as kotlin-reflect's sources, and
create an empty javadoc
---
 build.xml                              |  8 +++
 libraries/pom.xml                      |  1 -
 libraries/tools/kotlin-reflect/pom.xml | 74 ++++++++++----------------
 resources/kotlinManifest.properties    |  1 +
 4 files changed, 38 insertions(+), 46 deletions(-)

diff --git a/build.xml b/build.xml
index bd588e92262..118be654e8a 100644
--- a/build.xml
+++ b/build.xml
@@ -827,6 +827,14 @@
                 <fileset dir="${output}/core.src" includes="**/*"/>
             </jar-content>
         </pack-runtime-jar>
+
+        <pack-runtime-jar jar-dir="${output}" jar-name="kotlin-reflect-sources-for-maven.jar"
+                          implementation-title="${manifest.impl.title.kotlin.jvm.reflect.sources}">
+            <jar-content>
+                <fileset dir="${basedir}/core/reflection.jvm/src" includes="**/*"/>
+                <fileset dir="${output}/core.src" includes="**/*"/>
+            </jar-content>
+        </pack-runtime-jar>
     </target>
 
     <target name="runtime"
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 6fb0e6242b6..25286c9d135 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -45,7 +45,6 @@
         <asm.version>3.3.1</asm.version>
         <dart.name>dart-r3300</dart.name>
         <guava.version>11.0.2</guava.version>
-        <protobuf.version>2.5.0</protobuf.version>
         <junit-version>4.11</junit-version>
         <kotlin-maven-plugin.version>0.2.3.8</kotlin-maven-plugin.version>
         <kotlin-dist>${project-root}/dist</kotlin-dist>
diff --git a/libraries/tools/kotlin-reflect/pom.xml b/libraries/tools/kotlin-reflect/pom.xml
index 02bd85d63e0..11fa0aa53eb 100644
--- a/libraries/tools/kotlin-reflect/pom.xml
+++ b/libraries/tools/kotlin-reflect/pom.xml
@@ -21,44 +21,44 @@
             <artifactId>kotlin-stdlib</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <!-- Do not use ${protobuf.version} because it couldn't be resolve in gradle -->
-            <version>2.5.0</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</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>
-
+                <artifactId>maven-jar-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-sources</id>
-                        <phase>process-sources</phase>
+                        <id>empty-javadoc-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
                         <configuration>
-                            <target>
-                                <delete dir="${basedir}/target/copied-sources" failonerror="false" />
-                                <copy todir="${basedir}/target/copied-sources">
-                                    <fileset dir="${basedir}/../../../core/descriptor.loader.java/src"/>
-                                    <fileset dir="${basedir}/../../../core/descriptors/src"/>
-                                    <fileset dir="${basedir}/../../../core/descriptors.runtime/src"/>
-                                    <fileset dir="${basedir}/../../../core/deserialization/src"/>
-                                    <fileset dir="${basedir}/../../../core/reflection.jvm/src"/>
-                                    <fileset dir="${basedir}/../../../core/util.runtime/src"/>
-                                </copy>
-                            </target>
+                            <classifier>javadoc</classifier>
+                            <classesDirectory>${basedir}/javadoc</classesDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-jar</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+                                <copy file="${kotlin-dist}/kotlinc/lib/kotlin-reflect.jar"
+                                      tofile="${basedir}/target/${project.artifactId}-${project.version}.jar"
+                                      overwrite="true" verbose="true"/>
+                                <copy file="${kotlin-dist}/kotlin-reflect-sources-for-maven.jar"
+                                      tofile="${basedir}/target/${project.artifactId}-${project.version}-sources.jar"
+                                      overwrite="true" verbose="true"/>
+                            </tasks>
                         </configuration>
                         <goals>
                             <goal>run</goal>
@@ -66,22 +66,6 @@
                     </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/resources/kotlinManifest.properties b/resources/kotlinManifest.properties
index 6b68b3bd67c..7b356f1baab 100644
--- a/resources/kotlinManifest.properties
+++ b/resources/kotlinManifest.properties
@@ -9,6 +9,7 @@ manifest.impl.title.kotlin.compiler.ant.task=Kotlin Compiler Ant Tasks
 manifest.impl.title.kotlin.jvm.runtime=Kotlin Runtime
 manifest.impl.title.kotlin.jvm.reflect=Kotlin Reflect
 manifest.impl.title.kotlin.jvm.runtime.sources=Kotlin Runtime Sources
+manifest.impl.title.kotlin.jvm.reflect.sources=Kotlin Reflect Sources
 
 manifest.impl.title.kotlin.javascript.stdlib=Kotlin JavaScript StdLib
 manifest.spec.title.kotlin.javascript.lib=Kotlin JavaScript Lib