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 26b14bc [MXNET-1287] Up scala comp (#14667)
26b14bc is described below
commit 26b14bca0ace33b0f2767a71f7dfed52cef9c631
Author: Zach Kimberg <zach...@kimberg.com>
AuthorDate: Thu Apr 11 13:21:31 2019 -0700
[MXNET-1287] Up scala comp (#14667)
* Upgrade scala compiler
* Fix scala version mismatch
* Fix no source root warnings
* Misc compiler fixes
---
.../assembly/src/main/assembly/assembly.xml | 6 +--
.../assembly/src/main/assembly/javadoc.xml | 2 +-
.../assembly/src/main/assembly/source.xml | 2 +-
scala-package/core/pom.xml | 5 +--
scala-package/deploy/src/main/deploy/deploy.xml | 2 +-
scala-package/examples/pom.xml | 4 --
scala-package/infer/pom.xml | 4 --
scala-package/macros/pom.xml | 4 --
scala-package/pom.xml | 46 ++++++++++++----------
scala-package/spark/pom.xml | 5 +++
10 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/scala-package/assembly/src/main/assembly/assembly.xml
b/scala-package/assembly/src/main/assembly/assembly.xml
index 3a8e11b..5a93136 100644
--- a/scala-package/assembly/src/main/assembly/assembly.xml
+++ b/scala-package/assembly/src/main/assembly/assembly.xml
@@ -33,8 +33,8 @@
<exclude>org.slf4j:slf4j-api</exclude>
<exclude>args4j:args4j</exclude>
</excludes>
- <outputDirectory>/</outputDirectory>
- <useProjectArtifact>true</useProjectArtifact>
+ <outputDirectory>.</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
<unpack>true</unpack>
<scope>runtime</scope>
</dependencySet>
@@ -71,7 +71,7 @@
<include>cub/LICENSE.TXT</include>
<include>mkldnn/external/mklml_mac_2019.0.1.20180928/license.txt</include>
</includes>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>.</outputDirectory>
</fileSet>
</fileSets>
</assembly>
diff --git a/scala-package/assembly/src/main/assembly/javadoc.xml
b/scala-package/assembly/src/main/assembly/javadoc.xml
index 176fa43..c6df96a 100644
--- a/scala-package/assembly/src/main/assembly/javadoc.xml
+++ b/scala-package/assembly/src/main/assembly/javadoc.xml
@@ -25,7 +25,7 @@
<fileSets>
<fileSet>
<directory>${rootdir}/core/target/site/scaladocs</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>.</outputDirectory>
</fileSet>
</fileSets>
</assembly>
diff --git a/scala-package/assembly/src/main/assembly/source.xml
b/scala-package/assembly/src/main/assembly/source.xml
index c067861..1f004e8 100644
--- a/scala-package/assembly/src/main/assembly/source.xml
+++ b/scala-package/assembly/src/main/assembly/source.xml
@@ -29,7 +29,7 @@
<includes>
<include>**\/*.scala</include>
</includes>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>.</outputDirectory>
</fileSet>
</fileSets>
</assembly>
diff --git a/scala-package/core/pom.xml b/scala-package/core/pom.xml
index 5a28a11..b888b55 100644
--- a/scala-package/core/pom.xml
+++ b/scala-package/core/pom.xml
@@ -102,10 +102,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<configuration>
@@ -141,6 +137,7 @@
</plugin>
</plugins>
</build>
+
<dependencies>
<dependency>
<groupId>org.apache.mxnet</groupId>
diff --git a/scala-package/deploy/src/main/deploy/deploy.xml
b/scala-package/deploy/src/main/deploy/deploy.xml
index 7265e7d..f5b6248 100644
--- a/scala-package/deploy/src/main/deploy/deploy.xml
+++ b/scala-package/deploy/src/main/deploy/deploy.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-parser-combinators_2.11</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
diff --git a/scala-package/examples/pom.xml b/scala-package/examples/pom.xml
index d60782f..2575291 100644
--- a/scala-package/examples/pom.xml
+++ b/scala-package/examples/pom.xml
@@ -83,10 +83,6 @@
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
diff --git a/scala-package/infer/pom.xml b/scala-package/infer/pom.xml
index ed90d80..81e9393 100644
--- a/scala-package/infer/pom.xml
+++ b/scala-package/infer/pom.xml
@@ -47,10 +47,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<configuration>
diff --git a/scala-package/macros/pom.xml b/scala-package/macros/pom.xml
index 91a13d0..cb84824 100644
--- a/scala-package/macros/pom.xml
+++ b/scala-package/macros/pom.xml
@@ -52,10 +52,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<configuration>
diff --git a/scala-package/pom.xml b/scala-package/pom.xml
index 62def16..44b784a 100644
--- a/scala-package/pom.xml
+++ b/scala-package/pom.xml
@@ -53,8 +53,11 @@
</scm>
<properties>
+ <java.version>1.7</java.version>
<scala.version>2.11.8</scala.version>
<build.platform/>
+ <scala.binary.version>2.11</scala.binary.version>
+ <build.platform />
<cxx>g++</cxx>
<dollar>$</dollar>
<MXNET_DIR>${project.basedir}/..</MXNET_DIR>
@@ -252,9 +255,11 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
<encoding>UTF-8</encoding>
+ <skipMain>true</skipMain>
+ <skip>true</skip>
</configuration>
</plugin>
<plugin>
@@ -339,11 +344,12 @@
</executions>
</plugin>
<plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <version>2.15.2</version>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <version>3.4.4</version>
<configuration>
- <recompileMode>incremental</recompileMode>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
<compilerPlugins>
<compilerPlugin>
<groupId>org.scalamacros</groupId>
@@ -354,25 +360,19 @@
</configuration>
<executions>
<execution>
+ <id>compile</id>
<goals>
+ <goal>add-source</goal>
<goal>compile</goal>
<goal>testCompile</goal>
+ <goal>doc-jar</goal>
</goals>
</execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- <version>3.3.2</version>
- <configuration>
- </configuration>
- <executions>
<execution>
- <phase>package</phase>
- <id>attach-javadocs</id>
+ <id>presite</id>
+ <phase>pre-site</phase>
<goals>
- <goal>doc-jar</goal>
+ <goal>add-source</goal>
</goals>
</execution>
</executions>
@@ -388,6 +388,7 @@
</plugin>
</plugins>
</build>
+
<dependencies>
<dependency>
<groupId>commons-codec</groupId>
@@ -419,7 +420,7 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.11</artifactId>
- <version>3.0.4</version>
+ <version>3.0.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -454,7 +455,12 @@
<dependency>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-parser-combinators_2.11</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-xml_2.11</artifactId>
+ <version>1.0.6</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
diff --git a/scala-package/spark/pom.xml b/scala-package/spark/pom.xml
index 2acb70b..b61a427 100644
--- a/scala-package/spark/pom.xml
+++ b/scala-package/spark/pom.xml
@@ -50,5 +50,10 @@
<artifactId>args4j</artifactId>
<version>2.33</version>
</dependency>
+ <dependency>
+ <groupId>org.json4s</groupId>
+ <artifactId>json4s-core_2.11</artifactId>
+ <version>3.5.1</version>
+ </dependency>
</dependencies>
</project>
