You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by de...@apache.org on 2016/07/30 19:30:51 UTC
incubator-systemml git commit: [SYSTEMML-832] Upgrade Scala version
and prune dependencies
Repository: incubator-systemml
Updated Branches:
refs/heads/master b36fb29ea -> f2ea8770e
[SYSTEMML-832] Upgrade Scala version and prune dependencies
Upgrade default Scala version to 2.11.8.
Add a profile to support previous Scala version 2.10.
Remove unneeded Scala dependencies (scalacheck, scala-compiler, scala-actors
and scala-reflect).
Closes #198.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/f2ea8770
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/f2ea8770
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/f2ea8770
Branch: refs/heads/master
Commit: f2ea8770ea79232e49bd57d9761de2c1f8823300
Parents: b36fb29
Author: Jakob Odersky <ja...@odersky.com>
Authored: Sat Jul 30 12:27:12 2016 -0700
Committer: Deron Eriksson <de...@us.ibm.com>
Committed: Sat Jul 30 12:27:12 2016 -0700
----------------------------------------------------------------------
pom.xml | 45 ++++++++++++++-------------------------------
1 file changed, 14 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/f2ea8770/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f7ec5b7..b271cf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,10 +66,9 @@
<hadoop.version>2.4.1</hadoop.version>
<antlr.version>4.3</antlr.version>
<spark.version>1.4.1</spark.version>
- <scala.version>2.10.5</scala.version>
- <scala.binary.version>2.10</scala.binary.version>
- <scala.test.version>2.2.1</scala.test.version>
- <scala.check.version>1.11.3</scala.check.version>
+ <scala.version>2.11.8</scala.version>
+ <scala.binary.version>2.11</scala.binary.version>
+ <scala.test.version>2.2.6</scala.test.version>
<!-- OS-specific JVM arguments for running integration tests -->
<integrationTestExtraJVMArgs />
</properties>
@@ -485,6 +484,14 @@
<profiles>
<profile>
+ <id>scala-2.10</id>
+ <properties>
+ <scala.version>2.10.5</scala.version>
+ <scala.binary.version>2.10</scala.binary.version>
+ </properties>
+ </profile>
+
+ <profile>
<!-- Profile for Windows builds. Not currently needed, but might be needed
in the future. -->
<id>platform-windows</id>
@@ -851,14 +858,14 @@
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-core_2.10</artifactId>
+ <artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-mllib_2.10</artifactId>
+ <artifactId>spark-mllib_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
</dependency>
@@ -866,7 +873,7 @@
<!-- To support dataframe in mlcontext -->
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-sql_2.10</artifactId>
+ <artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
</dependency>
@@ -1060,30 +1067,12 @@
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-reflect</artifactId>
- <version>${scala.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
- <artifactId>scala-actors</artifactId>
- <version>${scala.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
<artifactId>scalap</artifactId>
<version>${scala.version}</version>
<scope>provided</scope>
@@ -1095,12 +1084,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.scalacheck</groupId>
- <artifactId>scalacheck_${scala.binary.version}</artifactId>
- <version>${scala.check.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>