From 4815a9e5a8866854c067e7409874e2195b4b6646 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 9 Jun 2015 15:39:04 +0300
Subject: [PATCH] Fix kotlin-reflect Maven artifact, attach sources jar

---
 libraries/tools/kotlin-reflect/pom.xml | 49 ++++++++++++++++++--------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/libraries/tools/kotlin-reflect/pom.xml b/libraries/tools/kotlin-reflect/pom.xml
index 1f9de196399..59a35382fab 100644
--- a/libraries/tools/kotlin-reflect/pom.xml
+++ b/libraries/tools/kotlin-reflect/pom.xml
@@ -25,6 +25,27 @@
 
     <build>
         <plugins>
+            <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"/>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -45,25 +66,25 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.9.1</version>
                 <executions>
                     <execution>
-                        <id>copy-jar</id>
+                        <id>attach-artifacts</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>
+                            <goal>attach-artifact</goal>
                         </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${kotlin-dist}/kotlin-reflect-sources-for-maven.jar</file>
+                                    <type>jar</type>
+                                    <classifier>sources</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>