From 7d9554b6b873e3c8ab0d7769916c85259fc5c8f0 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Tue, 24 Jan 2017 01:38:31 +0300
Subject: [PATCH] Remove sources.xml and maven-assembly-plugin execution.

---
 libraries/kotlin.test/common/pom.xml          | 17 -------
 .../common/src/assembly/sources.xml           | 46 -------------------
 libraries/kotlin.test/junit/pom.xml           | 16 -------
 .../junit/src/assembly/sources.xml            | 46 -------------------
 libraries/kotlin.test/pom.xml                 |  5 --
 5 files changed, 130 deletions(-)
 delete mode 100644 libraries/kotlin.test/common/src/assembly/sources.xml
 delete mode 100644 libraries/kotlin.test/junit/src/assembly/sources.xml

diff --git a/libraries/kotlin.test/common/pom.xml b/libraries/kotlin.test/common/pom.xml
index 3a0bc809136..b6bb5d3a937 100644
--- a/libraries/kotlin.test/common/pom.xml
+++ b/libraries/kotlin.test/common/pom.xml
@@ -43,23 +43,6 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/assembly/sources.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
diff --git a/libraries/kotlin.test/common/src/assembly/sources.xml b/libraries/kotlin.test/common/src/assembly/sources.xml
deleted file mode 100644
index 09920bce308..00000000000
--- a/libraries/kotlin.test/common/src/assembly/sources.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-    <id>sources</id>
-    <formats>
-        <format>jar</format>
-    </formats>
-
-    <baseDirectory>/</baseDirectory>
-
-    <fileSets>
-        <fileSet>
-            <filtered>true</filtered>
-            <lineEnding>unix</lineEnding>
-
-            <directory>src/main/kotlin</directory>
-
-            <outputDirectory/>
-
-            <includes>
-                <include>**/*.kt</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <filtered>true</filtered>
-            <lineEnding>unix</lineEnding>
-
-            <directory>src/main/kotlin.jvm</directory>
-            <outputDirectory/>
-
-            <includes>
-                <include>**/*.kt</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <filtered>true</filtered>
-            <lineEnding>unix</lineEnding>
-
-            <directory>src/main/kotlin.js</directory>
-            <outputDirectory/>
-
-            <includes>
-                <include>**/*.kt</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>
\ No newline at end of file
diff --git a/libraries/kotlin.test/junit/pom.xml b/libraries/kotlin.test/junit/pom.xml
index d85eb69d88b..9ce3da86758 100644
--- a/libraries/kotlin.test/junit/pom.xml
+++ b/libraries/kotlin.test/junit/pom.xml
@@ -29,22 +29,6 @@
         <testSourceDirectory>src/test/kotlin</testSourceDirectory>
 
         <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/assembly/sources.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/libraries/kotlin.test/junit/src/assembly/sources.xml b/libraries/kotlin.test/junit/src/assembly/sources.xml
deleted file mode 100644
index 0b85e85e290..00000000000
--- a/libraries/kotlin.test/junit/src/assembly/sources.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-    <id>sources</id>
-    <formats>
-        <format>jar</format>
-    </formats>
-
-    <baseDirectory>/</baseDirectory>
-
-    <fileSets>
-        <fileSet>
-            <filtered>true</filtered>
-            <lineEnding>unix</lineEnding>
-
-            <directory>../shared/src/main/kotlin</directory>
-
-            <outputDirectory/>
-
-            <includes>
-                <include>**/*.kt</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <filtered>true</filtered>
-            <lineEnding>unix</lineEnding>
-
-            <directory>../shared/src/main/kotlin.jvm</directory>
-            <outputDirectory/>
-
-            <includes>
-                <include>**/*.kt</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <filtered>true</filtered>
-            <lineEnding>unix</lineEnding>
-
-            <directory>src/main/kotlin</directory>
-            <outputDirectory/>
-
-            <includes>
-                <include>**/*.kt</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>
\ No newline at end of file
diff --git a/libraries/kotlin.test/pom.xml b/libraries/kotlin.test/pom.xml
index c6bdd3381db..fea28e95f65 100644
--- a/libraries/kotlin.test/pom.xml
+++ b/libraries/kotlin.test/pom.xml
@@ -59,11 +59,6 @@
                     <version>2.7</version>
                 </plugin>
 
-                <plugin>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.6</version>
-                </plugin>
-
                 <plugin>
                     <groupId>org.jetbrains.kotlin</groupId>
                     <artifactId>kotlin-maven-plugin</artifactId>