You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2017/07/13 05:22:07 UTC
zeppelin git commit: [ZEPPELIN-2648] Fix spark module build problem
with scala-2.10 profile
Repository: zeppelin
Updated Branches:
refs/heads/master 278f7185e -> 3f9ef6e62
[ZEPPELIN-2648] Fix spark module build problem with scala-2.10 profile
* remove scala version in spark2 profile , we should compose scala profile and spark profile to address scala and spark version
* address scalaVersion evidently in maven-scala-plugin
### What is this PR for?
details by ZEPPELIN-2648
### What type of PR is it?
[Bug Fix]
### Todos
None
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-2648
### How should this be tested?
execute below command and check whether the zeppelin-spark artifact is build based on specified scala and spark version.
mvn clean package -Pscala-2.10 -Pspark-2.1
mvn clean package -Pscala-2.11 -Pspark-2.1
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: lichenyang <li...@cmss.chinamobile.com>
Closes #2470 from reminia/zeppelin-2648 and squashes the following commits:
31c7aa5 [lichenyang] remove scala version in the spark-dependencies pom
fb57494 [lichenyang] [ZEPPELIN-2648] Fix spark module build problem with scala-2.10 profile
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/3f9ef6e6
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/3f9ef6e6
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/3f9ef6e6
Branch: refs/heads/master
Commit: 3f9ef6e6272612f0e15f33459c345392dcab7c56
Parents: 278f718
Author: lichenyang <li...@cmss.chinamobile.com>
Authored: Mon Jul 10 11:35:53 2017 +0800
Committer: Lee moon soo <mo...@apache.org>
Committed: Thu Jul 13 14:21:59 2017 +0900
----------------------------------------------------------------------
spark-dependencies/pom.xml | 2 --
spark/pom.xml | 3 +--
2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3f9ef6e6/spark-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml
index 50d8ed5..3bb897b 100644
--- a/spark-dependencies/pom.xml
+++ b/spark-dependencies/pom.xml
@@ -540,7 +540,6 @@
<spark.version>2.0.2</spark.version>
<protobuf.version>2.5.0</protobuf.version>
<spark.py4j.version>0.10.3</spark.py4j.version>
- <scala.version>2.11.8</scala.version>
</properties>
</profile>
@@ -553,7 +552,6 @@
<spark.version>2.1.0</spark.version>
<protobuf.version>2.5.0</protobuf.version>
<spark.py4j.version>0.10.4</spark.py4j.version>
- <scala.version>2.11.8</scala.version>
</properties>
</profile>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3f9ef6e6/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index ade4081..acb9f87 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -424,6 +424,7 @@
<artifactId>maven-scala-plugin</artifactId>
<version>${plugin.scala.version}</version>
<configuration>
+ <scalaVersion>${scala.version}</scalaVersion>
<excludes>
<exclude>**/ZeppelinR.scala</exclude>
<exclude>**/SparkRBackend.scala</exclude>
@@ -550,7 +551,6 @@
<spark.version>2.0.2</spark.version>
<protobuf.version>2.5.0</protobuf.version>
<spark.py4j.version>0.10.3</spark.py4j.version>
- <scala.version>2.11.8</scala.version>
</properties>
</profile>
@@ -563,7 +563,6 @@
<spark.version>2.1.0</spark.version>
<protobuf.version>2.5.0</protobuf.version>
<spark.py4j.version>0.10.4</spark.py4j.version>
- <scala.version>2.11.8</scala.version>
</properties>
</profile>