MXNET-1302 Exclude commons-codec and commons-io from assembled JAR

apache · Feb 10, 2019 · 038a1f0 · 038a1f0
1 parent 2ff8ce0
commit 038a1f0
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 5 deletions.
diff --git 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/assembly/src/main/assembly/assembly.xml b/scala-package/assembly/src/main/assembly/assembly.xml
@@ -10,6 +10,8 @@
         <include>*:*:jar</include>
       </includes>
       <excludes>
+        <exclude>commons-codec:</exclude>
+        <exclude>commons-io:*</exclude>
         <exclude>org.scala-lang:*</exclude>
         <exclude>org.scala-lang.modules:*</exclude>
       </excludes>

diff --git a/scala-package/core/pom.xml b/scala-package/core/pom.xml
@@ -138,10 +138,22 @@
       <version>INTERNAL</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </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>
+      <scope>provided</scope>
     </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
@@ -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
@@ -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
@@ -377,6 +377,7 @@
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
       <version>1.10</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>