From 31f1ae460fcac7c29142fd2fb335069a4f95932a Mon Sep 17 00:00:00 2001
From: Gordon Reid <gordon1992@users.noreply.github.com>
Date: Fri, 1 Mar 2019 18:11:29 +0000
Subject: [PATCH] MXNET-1302 Exclude commons-codec and commons-io from
 assembled JAR (#14000)

---
 CONTRIBUTORS.md                                       |  1 +
 scala-package/assembly/src/main/assembly/assembly.xml |  2 ++
 scala-package/core/pom.xml                            |  5 -----
 scala-package/deploy/src/main/deploy/deploy.xml       | 10 ++++++++++
 scala-package/macros/pom.xml                          |  5 -----
 scala-package/pom.xml                                 |  5 +++++
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index caec6cfacdf7..caf61e8be6c2 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -212,6 +212,7 @@ List of Contributors
 * [Xiao Wang](https://github.com/BeyonderXX)
 * [Piyush Ghai](https://github.com/piyushghai)
 * [Zach Boldyga](https://github.com/zboldyga)
+* [Gordon Reid](https://github.com/gordon1992)
 
 * [Ming Yang](http://ufoym.com)
 
diff --git a/scala-package/assembly/src/main/assembly/assembly.xml b/scala-package/assembly/src/main/assembly/assembly.xml
index eaa30180dbf3..4c3d17392624 100644
--- a/scala-package/assembly/src/main/assembly/assembly.xml
+++ b/scala-package/assembly/src/main/assembly/assembly.xml
@@ -28,6 +28,8 @@
       <excludes>
         <exclude>org.scala-lang:*</exclude>
         <exclude>org.scala-lang.modules:*</exclude>
+        <exclude>commons-io:commons-io</exclude>
+        <exclude>commons-codec:commons-codec</exclude>
       </excludes>
       <outputDirectory>/</outputDirectory>
       <useProjectArtifact>true</useProjectArtifact>
diff --git a/scala-package/core/pom.xml b/scala-package/core/pom.xml
index c513d28c53d8..5a28a11a0208 100644
--- a/scala-package/core/pom.xml
+++ b/scala-package/core/pom.xml
@@ -154,11 +154,6 @@
       <version>INTERNAL</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.1</version>
-    </dependency>
     <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
     <dependency>
       <groupId>org.mockito</groupId>
diff --git a/scala-package/deploy/src/main/deploy/deploy.xml b/scala-package/deploy/src/main/deploy/deploy.xml
index 8d248943f2ee..c5be7e2c5ea1 100644
--- a/scala-package/deploy/src/main/deploy/deploy.xml
+++ b/scala-package/deploy/src/main/deploy/deploy.xml
@@ -45,5 +45,15 @@
       <artifactId>scala-compiler</artifactId>
       <version>SCALA_VERSION</version>
     </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.10</version>
+    </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 d6dd0201897f..91a13d0fc521 100644
--- a/scala-package/macros/pom.xml
+++ b/scala-package/macros/pom.xml
@@ -36,11 +36,6 @@
       <version>INTERNAL</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.1</version>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/scala-package/pom.xml b/scala-package/pom.xml
index a782be875be3..62def16627b9 100644
--- a/scala-package/pom.xml
+++ b/scala-package/pom.xml
@@ -394,6 +394,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>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>