From 0c48b1748d28d471404ae14c13acc1a662f1496f Mon Sep 17 00:00:00 2001
From: Gordon Reid <gordon.reid1992@hotmail.co.uk>
Date: Sun, 10 Feb 2019 10:38:44 +0000
Subject: [PATCH] MXNET-1302 Exclude commons-codec and commons-io from
 assembled JAR

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

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 6bf44c55de6d..c905f9fcaff9 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -195,6 +195,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)
 
 Label Bot
 ---------
diff --git a/scala-package/core/pom.xml b/scala-package/core/pom.xml
index 4de65c0b361a..be270f7702a2 100644
--- a/scala-package/core/pom.xml
+++ b/scala-package/core/pom.xml
@@ -139,9 +139,9 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.1</version>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.10</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
     <dependency>
diff --git a/scala-package/deploy/src/main/deploy/deploy.xml b/scala-package/deploy/src/main/deploy/deploy.xml
index 7bfd20737537..fb7af108e150 100644
--- a/scala-package/deploy/src/main/deploy/deploy.xml
+++ b/scala-package/deploy/src/main/deploy/deploy.xml
@@ -29,5 +29,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-codec</artifactId>
+      <version>2.1</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/scala-package/macros/pom.xml b/scala-package/macros/pom.xml
index 52dfde181d72..aec3924e7316 100644
--- a/scala-package/macros/pom.xml
+++ b/scala-package/macros/pom.xml
@@ -20,11 +20,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 5ba6f1f9f498..d3e7a7391757 100644
--- a/scala-package/pom.xml
+++ b/scala-package/pom.xml
@@ -377,6 +377,13 @@
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
       <version>1.10</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.1</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>