From 53ed8483a830aa59eaf6b4efe8022011553bd942 Mon Sep 17 00:00:00 2001
From: Gordon Reid <gordon.reid1992@hotmail.co.uk>
Date: Thu, 28 Mar 2019 17:13:38 +0000
Subject: [PATCH] [MXNET-1302,MXNET-1331] Backport fix for 3rd party libaries
 in output JAR to v1.3.x branch

---
 .../src/main/assembly/assembly.xml            |  8 +++++
 .../src/main/assembly/assembly.xml            |  8 +++++
 .../osx-x86_64-cpu/main/assembly/assembly.xml | 30 -------------------
 .../src/main/assembly/assembly.xml            |  8 +++++
 scala-package/core/pom.xml                    |  5 ----
 scala-package/macros/pom.xml                  |  5 ----
 scala-package/pom.xml                         |  5 ++++
 7 files changed, 29 insertions(+), 40 deletions(-)
 delete mode 100644 scala-package/assembly/osx-x86_64-cpu/main/assembly/assembly.xml

diff --git a/scala-package/assembly/linux-x86_64-cpu/src/main/assembly/assembly.xml b/scala-package/assembly/linux-x86_64-cpu/src/main/assembly/assembly.xml
index a574f8af25d9..8823aba7673b 100644
--- a/scala-package/assembly/linux-x86_64-cpu/src/main/assembly/assembly.xml
+++ b/scala-package/assembly/linux-x86_64-cpu/src/main/assembly/assembly.xml
@@ -9,6 +9,14 @@
       <includes>
         <include>*:*:jar</include>
       </includes>
+      <excludes>
+        <exclude>org.scala-lang:*</exclude>
+        <exclude>org.scala-lang.modules:*</exclude>
+        <exclude>commons-io:commons-io</exclude>
+        <exclude>commons-codec:commons-codec</exclude>
+        <exclude>org.slf4j:slf4j-api</exclude>
+        <exclude>args4j:args4j</exclude>
+      </excludes>
       <outputDirectory>/</outputDirectory>
       <useProjectArtifact>true</useProjectArtifact>
       <unpack>true</unpack>
diff --git a/scala-package/assembly/linux-x86_64-gpu/src/main/assembly/assembly.xml b/scala-package/assembly/linux-x86_64-gpu/src/main/assembly/assembly.xml
index 3a064bf9f2ce..71efe67aa772 100644
--- a/scala-package/assembly/linux-x86_64-gpu/src/main/assembly/assembly.xml
+++ b/scala-package/assembly/linux-x86_64-gpu/src/main/assembly/assembly.xml
@@ -9,6 +9,14 @@
       <includes>
         <include>*:*:jar</include>
       </includes>
+      <excludes>
+        <exclude>org.scala-lang:*</exclude>
+        <exclude>org.scala-lang.modules:*</exclude>
+        <exclude>commons-io:commons-io</exclude>
+        <exclude>commons-codec:commons-codec</exclude>
+        <exclude>org.slf4j:slf4j-api</exclude>
+        <exclude>args4j:args4j</exclude>
+      </excludes>
       <outputDirectory>/</outputDirectory>
       <useProjectArtifact>true</useProjectArtifact>
       <unpack>true</unpack>
diff --git a/scala-package/assembly/osx-x86_64-cpu/main/assembly/assembly.xml b/scala-package/assembly/osx-x86_64-cpu/main/assembly/assembly.xml
deleted file mode 100644
index fecafecad31e..000000000000
--- a/scala-package/assembly/osx-x86_64-cpu/main/assembly/assembly.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<assembly>
-  <id>full</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <includes>
-        <include>*:*:jar</include>
-      </includes>
-      <outputDirectory>/</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-      <unpack>true</unpack>
-      <scope>runtime</scope>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>lib/native</outputDirectory>
-      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-      <unpack>false</unpack>
-      <useProjectArtifact>false</useProjectArtifact>
-      <useStrictFiltering>false</useStrictFiltering>
-      <includes>
-        <include>*:*:dll:*</include>
-        <include>*:*:so:*</include>
-        <include>*:*:jnilib:*</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
diff --git a/scala-package/assembly/osx-x86_64-cpu/src/main/assembly/assembly.xml b/scala-package/assembly/osx-x86_64-cpu/src/main/assembly/assembly.xml
index bdbd09f170c0..74878ea63efe 100644
--- a/scala-package/assembly/osx-x86_64-cpu/src/main/assembly/assembly.xml
+++ b/scala-package/assembly/osx-x86_64-cpu/src/main/assembly/assembly.xml
@@ -9,6 +9,14 @@
       <includes>
         <include>*:*:jar</include>
       </includes>
+      <excludes>
+        <exclude>org.scala-lang:*</exclude>
+        <exclude>org.scala-lang.modules:*</exclude>
+        <exclude>commons-io:commons-io</exclude>
+        <exclude>commons-codec:commons-codec</exclude>
+        <exclude>org.slf4j:slf4j-api</exclude>
+        <exclude>args4j:args4j</exclude>
+      </excludes>
       <outputDirectory>/</outputDirectory>
       <useProjectArtifact>true</useProjectArtifact>
       <unpack>true</unpack>
diff --git a/scala-package/core/pom.xml b/scala-package/core/pom.xml
index 0ee749419655..d985efd16dcf 100644
--- a/scala-package/core/pom.xml
+++ b/scala-package/core/pom.xml
@@ -104,10 +104,5 @@
       <version>1.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.1</version>
-    </dependency>
   </dependencies>
 </project>
diff --git a/scala-package/macros/pom.xml b/scala-package/macros/pom.xml
index ae4c60a1e6d0..cfd68b5e1dc2 100644
--- a/scala-package/macros/pom.xml
+++ b/scala-package/macros/pom.xml
@@ -63,11 +63,6 @@
       <scope>provided</scope>
       <type>${libtype}</type>
     </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.1</version>
-    </dependency>
   </dependencies>
 
 
diff --git a/scala-package/pom.xml b/scala-package/pom.xml
index fe78a629ed20..f6ffc577fd2f 100644
--- a/scala-package/pom.xml
+++ b/scala-package/pom.xml
@@ -330,6 +330,11 @@
       <artifactId>commons-codec</artifactId>
       <version>1.10</version>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.1</version>
+    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>