You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by la...@apache.org on 2019/03/01 18:11:55 UTC
[incubator-mxnet] branch master updated: MXNET-1302 Exclude
commons-codec and commons-io from assembled JAR (#14000)
This is an automated email from the ASF dual-hosted git repository.
lanking pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new c6b1fd5 MXNET-1302 Exclude commons-codec and commons-io from assembled JAR (#14000)
c6b1fd5 is described below
commit c6b1fd5a74152b64f92a8b76e1d28f4c0d4f00cd
Author: Gordon Reid <go...@users.noreply.github.com>
AuthorDate: Fri Mar 1 18:11:29 2019 +0000
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 caec6cf..caf61e8 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 eaa3018..4c3d173 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 c513d28..5a28a11 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 8d24894..c5be7e2 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 d6dd020..91a13d0 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 a782be8..62def16 100644
--- a/scala-package/pom.xml
+++ b/scala-package/pom.xml
@@ -395,6 +395,11 @@
<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>
<version>2.11.1</version>