This is an automated email from the ASF dual-hosted git repository.
lanking pushed a commit to branch v1.4.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.4.x by this push:
new e368ea2 Exclude external dependencies from MXNet JAR (and fix Clojure
build) (#15361)
e368ea2 is described below
commit e368ea24895b92f7e6b43fc0a51b3b0131193f12
Author: tklein23 <tklei...@users.noreply.github.com>
AuthorDate: Mon Jul 1 23:51:32 2019 +0200
Exclude external dependencies from MXNet JAR (and fix Clojure build)
(#15361)
---
CONTRIBUTORS.md | 1 +
contrib/clojure-package/project.clj | 9 +++++-
scala-package/assembly/linux-x86_64-cpu/pom.xml | 36 ++++++++++++++++++++++
.../src/main/assembly/assembly.xml | 8 +++++
scala-package/assembly/linux-x86_64-gpu/pom.xml | 36 ++++++++++++++++++++++
.../src/main/assembly/assembly.xml | 8 +++++
scala-package/assembly/osx-x86_64-cpu/pom.xml | 36 ++++++++++++++++++++++
.../osx-x86_64-cpu/src/main/assembly/assembly.xml | 8 +++++
scala-package/assembly/pom.xml | 1 +
scala-package/core/pom.xml | 5 ---
scala-package/macros/pom.xml | 6 ----
scala-package/pom.xml | 5 +++
12 files changed, 147 insertions(+), 12 deletions(-)
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 8ca8a89..51157ca 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -209,6 +209,7 @@ List of Contributors
* [Rahul Padmanabhan](https://github.com/rahul3)
* [Yuxi Hu](https://github.com/yuxihu)
* [Harsh Patel](https://github.com/harshp8l)
+* [Thoralf Klein](https://github.com/tklein23)
Label Bot
---------
diff --git a/contrib/clojure-package/project.clj
b/contrib/clojure-package/project.clj
index 821da0e..ebc8256 100644
--- a/contrib/clojure-package/project.clj
+++ b/contrib/clojure-package/project.clj
@@ -34,7 +34,14 @@
[org.clojure/tools.logging "0.4.0"]
[org.apache.logging.log4j/log4j-core "2.8.1"]
[org.apache.logging.log4j/log4j-api "2.8.1"]
- [org.slf4j/slf4j-log4j12 "1.7.25" :exclusions
[org.slf4j/slf4j-api]]]
+ [org.slf4j/slf4j-log4j12 "1.7.25"]
+ [org.slf4j/slf4j-api "1.7.5"]
+
+ [org.scala-lang/scala-library "2.11.8"]
+ [org.scala-lang/scala-reflect "2.11.8"]
+ [org.scala-lang.modules/scala-parser-combinators_2.11 "1.0.4"]
+ ]
+
:pedantic? :skip
:plugins [[lein-codox "0.10.6" :exclusions [org.clojure/clojure]]
[lein-cloverage "1.0.10" :exclusions [org.clojure/clojure]]
diff --git a/scala-package/assembly/linux-x86_64-cpu/pom.xml
b/scala-package/assembly/linux-x86_64-cpu/pom.xml
index 6177676..ba2c030 100644
--- a/scala-package/assembly/linux-x86_64-cpu/pom.xml
+++ b/scala-package/assembly/linux-x86_64-cpu/pom.xml
@@ -47,6 +47,42 @@
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
<version>1.4.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-reflect</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>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>2.11.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
+ <groupId>args4j</groupId>
+ <artifactId>args4j</artifactId>
+ <version>2.0.29</version>
+ </dependency>
</dependencies>
<build>
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 9f28706..9628db6 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
@@ -25,6 +25,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/pom.xml
b/scala-package/assembly/linux-x86_64-gpu/pom.xml
index 1209a15..12a3e96 100644
--- a/scala-package/assembly/linux-x86_64-gpu/pom.xml
+++ b/scala-package/assembly/linux-x86_64-gpu/pom.xml
@@ -47,6 +47,42 @@
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
<version>1.4.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-reflect</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>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>2.11.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
+ <groupId>args4j</groupId>
+ <artifactId>args4j</artifactId>
+ <version>2.0.29</version>
+ </dependency>
</dependencies>
<build>
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 2b65a8c..c844ed5 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
@@ -25,6 +25,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/pom.xml
b/scala-package/assembly/osx-x86_64-cpu/pom.xml
index 60f667f..4ecfb0f 100644
--- a/scala-package/assembly/osx-x86_64-cpu/pom.xml
+++ b/scala-package/assembly/osx-x86_64-cpu/pom.xml
@@ -47,6 +47,42 @@
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
<version>1.4.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-reflect</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>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>2.11.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
+ <groupId>args4j</groupId>
+ <artifactId>args4j</artifactId>
+ <version>2.0.29</version>
+ </dependency>
</dependencies>
<build>
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 7a6c3ea..5de92d9 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
@@ -25,6 +25,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/pom.xml b/scala-package/assembly/pom.xml
index d23c175..5b10db9 100644
--- a/scala-package/assembly/pom.xml
+++ b/scala-package/assembly/pom.xml
@@ -88,6 +88,7 @@
<includeDependencySources>true</includeDependencySources>
<dependencySourceExcludes>
<dependencySourceExclude>commons-codec:*</dependencySourceExclude>
+
<dependencySourceExclude>commons-io:*</dependencySourceExclude>
<dependencySourceExclude>org.scala-lang:*</dependencySourceExclude>
<dependencySourceExclude>log4j:*</dependencySourceExclude>
<dependencySourceExclude>org.slf4j:*</dependencySourceExclude>
diff --git a/scala-package/core/pom.xml b/scala-package/core/pom.xml
index 812f2c4..55a8706 100644
--- a/scala-package/core/pom.xml
+++ b/scala-package/core/pom.xml
@@ -131,11 +131,6 @@
<version>4.11</version>
<scope>test</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/macros/pom.xml b/scala-package/macros/pom.xml
index f8fbfb2..7aff92c 100644
--- a/scala-package/macros/pom.xml
+++ b/scala-package/macros/pom.xml
@@ -79,14 +79,8 @@
<scope>provided</scope>
<type>${libtype}</type>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.1</version>
- </dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
diff --git a/scala-package/pom.xml b/scala-package/pom.xml
index 857b445..36c0711 100644
--- a/scala-package/pom.xml
+++ b/scala-package/pom.xml
@@ -348,6 +348,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>
