You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hivemall.apache.org by my...@apache.org on 2018/11/07 17:48:04 UTC
[2/2] incubator-hivemall git commit: Fixed scalatest version used for
Spark 2.3 to avoid scalatest version conflict
Fixed scalatest version used for Spark 2.3 to avoid scalatest version conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/commit/52613791
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/tree/52613791
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/diff/52613791
Branch: refs/heads/master
Commit: 526137914427d2747709ac9f82315362e87e14c4
Parents: 65e2ac1
Author: Makoto Yui <my...@apache.org>
Authored: Thu Nov 8 02:47:50 2018 +0900
Committer: Makoto Yui <my...@apache.org>
Committed: Thu Nov 8 02:47:50 2018 +0900
----------------------------------------------------------------------
spark/pom.xml | 2 +-
spark/spark-2.3/pom.xml | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/52613791/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index 99553f9..08f401d 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
- <version>2.2.4</version>
+ <version>2.2.6</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/52613791/spark/spark-2.3/pom.xml
----------------------------------------------------------------------
diff --git a/spark/spark-2.3/pom.xml b/spark/spark-2.3/pom.xml
index 0ab424f..167524f 100644
--- a/spark/spark-2.3/pom.xml
+++ b/spark/spark-2.3/pom.xml
@@ -32,6 +32,7 @@
<properties>
<main.basedir>${project.parent.parent.basedir}</main.basedir>
+ <!-- <scala.version>2.11.12</scala.version> -->
<spark.version>2.3.0</spark.version>
<spark.binary.version>2.3</spark.binary.version>
<hadoop.version>2.6.5</hadoop.version>
@@ -40,6 +41,18 @@
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.scalatest</groupId>
+ <artifactId>scalatest_${scala.binary.version}</artifactId>
+ <version>3.0.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<!-- compile scope -->
<dependency>