felixcheung closed pull request #3253: [ZEPPELIN-3551] Upgrade Scala to 2.11.12
URL: https://github.com/apache/zeppelin/pull/3253
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/.travis.yml b/.travis.yml
index 8619455253..969478a698 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -90,13 +90,13 @@ matrix:
- sudo: required
jdk: "oraclejdk8"
dist: trusty
- env: BUILD_PLUGINS="true" PYTHON="2" PROFILE="-Pspark-2.2" SPARKR="true"
BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am"
MODULES="-pl
zeppelin-zengine,zeppelin-server,spark/interpreter,spark/spark-dependencies"
TEST_PROJECTS="-Dtest=ZeppelinSparkClusterTest,org.apache.zeppelin.spark.*
-DfailIfNoTests=false"
+ env: BUILD_PLUGINS="true" PYTHON="2" PROFILE="-Pspark-2.2 -Pscala-2.11"
SPARKR="true" BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test
-DskipRat -am" MODULES="-pl
zeppelin-zengine,zeppelin-server,spark/interpreter,spark/spark-dependencies"
TEST_PROJECTS="-Dtest=ZeppelinSparkClusterTest,org.apache.zeppelin.spark.*
-DfailIfNoTests=false"
# Integration test of spark interpreter with different spark versions
under python3, only run SparkIntegrationTest. Also run spark unit test of spark
1.6 in this build.
- sudo: required
jdk: "oraclejdk8"
dist: trusty
- env: BUILD_PLUGINS="true" PYTHON="3" SCALA_VER="2.10"
PROFILE="-Pspark-1.6 -Pscala-2.10" SPARKR="true" BUILD_FLAG="install
-DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl
zeppelin-zengine,spark/interpreter,spark/spark-dependencies"
TEST_PROJECTS="-Dtest=SparkIntegrationTest,org.apache.zeppelin.spark.*
-DfailIfNoTests=false"
+ env: BUILD_PLUGINS="true" PYTHON="3" PROFILE="-Pspark-1.6 -Pscala-2.10"
SPARKR="true" BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test
-DskipRat -am" MODULES="-pl
zeppelin-zengine,spark/interpreter,spark/spark-dependencies"
TEST_PROJECTS="-Dtest=SparkIntegrationTest,org.apache.zeppelin.spark.*
-DfailIfNoTests=false"
# Test spark module for 2.4.0 with scala 2.11
- jdk: "oraclejdk8"
diff --git a/pom.xml b/pom.xml
index a66900dde5..af16df65ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -738,9 +738,6 @@
<profiles>
<profile>
<id>scala-2.10</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<properties>
<scala.version>2.10.5</scala.version>
<scala.binary.version>2.10</scala.binary.version>
@@ -749,6 +746,9 @@
<profile>
<id>scala-2.11</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<properties>
<scala.version>2.11.8</scala.version>
<scala.binary.version>2.11</scala.binary.version>
diff --git a/spark/scala-2.11/pom.xml b/spark/scala-2.11/pom.xml
index fc55afd8b9..5a70d2ca77 100644
--- a/spark/scala-2.11/pom.xml
+++ b/spark/scala-2.11/pom.xml
@@ -33,7 +33,7 @@
<name>Zeppelin: Spark Interpreter Scala_2.11</name>
<properties>
- <scala.version>2.11.8</scala.version>
+ <scala.version>2.11.12</scala.version>
<scala.binary.version>2.11</scala.binary.version>
<scala.compile.version>${scala.version}</scala.compile.version>
</properties>
diff --git a/spark/spark-scala-parent/pom.xml b/spark/spark-scala-parent/pom.xml
index 8aeb40361b..f6f918b817 100644
--- a/spark/spark-scala-parent/pom.xml
+++ b/spark/spark-scala-parent/pom.xml
@@ -40,6 +40,12 @@
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-interpreter-api</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -84,6 +90,11 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>2.14.3</version>
+ </dependency>
</dependencies>
<build>
diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml
index 8e67dc1ee2..e1c803ec9d 100644
--- a/zeppelin-zengine/pom.xml
+++ b/zeppelin-zengine/pom.xml
@@ -55,6 +55,12 @@
<groupId>${project.groupId}</groupId>
<artifactId>zeppelin-interpreter</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
