diff --git a/.travis.yml b/.travis.yml
index 6013bbf5f44..168193c2b69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,9 +33,9 @@ addons:
matrix:
include:
- # Test all modules with spark-2.0.0-preview and scala 2.11
+ # Test all modules with spark 2.0.0 and scala 2.11
- jdk: "oraclejdk7"
- env: SCALA_VER="2.11" SPARK_VER="2.0.0" HADOOP_VER="2.3" PROFILE="-Pspark-2.0 -Dspark.version=2.0.0-preview -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS=""
+ env: SCALA_VER="2.11" SPARK_VER="2.0.0" HADOOP_VER="2.3" PROFILE="-Pspark-2.0 -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS=""
# Test all modules with scala 2.10
- jdk: "oraclejdk7"
diff --git a/README.md b/README.md
index d702467d168..57ea2679da4 100644
--- a/README.md
+++ b/README.md
@@ -217,6 +217,7 @@ Here're some examples:
```sh
# build with spark-2.0, scala-2.11
+./dev/change_scala_version.sh 2.11
mvn clean package -Pspark-2.0 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pscala-2.11
# build with spark-1.6, scala-2.10
@@ -306,6 +307,7 @@ For configuration details check __`./conf`__ subdirectory.
To produce a Zeppelin package compiled with Scala 2.11, use the -Pscala-2.11 profile:
```
+./dev/change_scala_version.sh 2.11
mvn clean package -Pspark-1.6 -Phadoop-2.4 -Pyarn -Ppyspark -Pscala-2.11 -DskipTests clean install
```
diff --git a/dev/create_release.sh b/dev/create_release.sh
index 60fc5bd9389..14688b60f97 100755
--- a/dev/create_release.sh
+++ b/dev/create_release.sh
@@ -66,6 +66,7 @@ function make_binary_release() {
cp -r "${WORKING_DIR}/zeppelin" "${WORKING_DIR}/zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}"
cd "${WORKING_DIR}/zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}"
+ ./dev/change_scala_version.sh 2.11
echo "mvn clean package -Pbuild-distr -DskipTests ${BUILD_FLAGS}"
mvn clean package -Pbuild-distr -DskipTests ${BUILD_FLAGS}
if [[ $? -ne 0 ]]; then
@@ -102,8 +103,8 @@ function make_binary_release() {
git_clone
make_source_package
-make_binary_release all "-Pspark-1.6 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr"
-make_binary_release netinst "-Pspark-1.6 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr -pl !alluxio,!angular,!cassandra,!elasticsearch,!file,!flink,!hbase,!ignite,!jdbc,!kylin,!lens,!livy,!markdown,!postgresql,!python,!shell"
+make_binary_release all "-Pspark-2.0 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr -Pscala-2.11"
+make_binary_release netinst "-Pspark-2.0 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pr -Pscala-2.11 -pl !alluxio,!angular,!cassandra,!elasticsearch,!file,!flink,!hbase,!ignite,!jdbc,!kylin,!lens,!livy,!markdown,!postgresql,!python,!shell"
# remove non release files and dirs
rm -rf "${WORKING_DIR}/zeppelin"
diff --git a/docs/install/install.md b/docs/install/install.md
index 98adc745fe3..93891ef4874 100644
--- a/docs/install/install.md
+++ b/docs/install/install.md
@@ -94,6 +94,7 @@ Here are some examples with several options
```
# build with spark-2.0, scala-2.11
+./dev/change_scala_version.sh 2.11
mvn clean package -Pspark-2.0 -Phadoop-2.4 -Pyarn -Ppyspark -Psparkr -Pscala-2.11
# build with spark-1.6, scala-2.10
@@ -394,4 +395,4 @@ You can configure Apache Zeppelin with both **environment variables** in `conf/z
| 1024000 |
Size in characters of the maximum text message to be received by websocket. |
-
\ No newline at end of file
+
diff --git a/docs/manual/interpreterinstallation.md b/docs/manual/interpreterinstallation.md
index dd182b50399..cfd58105a94 100644
--- a/docs/manual/interpreterinstallation.md
+++ b/docs/manual/interpreterinstallation.md
@@ -84,6 +84,15 @@ If you install one of these interpreters only with `--name` option, installer wi
./bin/install-interpreter.sh --name flink --artifact org.apache.zeppelin:zeppelin-flink_2.10:0.6.1
```
+#### Install Spark interpreter built with Scala 2.10
+Spark distribution package has been built with Scala 2.10 until 1.6.2. If you have `SPARK_HOME` set pointing to Spark version ealier than 2.0.0, you need to download Spark interpreter packaged with Scala 2.10. To do so, use follow command:
+
+```
+rm -rf ./interpreter/spark
+./bin/install-interpreter.sh --name spark --artifact org.apache.zeppelin:zeppelin-spark_2.10:0.6.1
+```
+
+
Once you have installed interpreters, you need to restart Zeppelin. And then [create interpreter setting](../manual/interpreters.html#what-is-zeppelin-interpreter) and [bind it with your notebook](../manual/interpreters.html#what-is-zeppelin-interpreter-setting).
diff --git a/pom.xml b/pom.xml
index 93e6ed93d10..c0b1935b075 100644
--- a/pom.xml
+++ b/pom.xml
@@ -652,7 +652,7 @@
scala-2.10
- !scala-2.11
+ true
2.10.5
@@ -662,9 +662,6 @@
scala-2.11
-
- scala-2.11
-
2.11.7
2.11
diff --git a/r/pom.xml b/r/pom.xml
index 0e7d78deb61..2dc2eef5af7 100644
--- a/r/pom.xml
+++ b/r/pom.xml
@@ -380,7 +380,7 @@
scala-2.10
- !scala-2.11
+ true
src/main/scala-2.10
@@ -390,9 +390,6 @@
scala-2.11
-
- scala-2.11
-
src/main/scala-2.11
src/test/scala/scala-2.11
diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml
index 47644eefcbf..c30b0614ccf 100644
--- a/zeppelin-display/pom.xml
+++ b/zeppelin-display/pom.xml
@@ -94,10 +94,6 @@
scala-2.11
-
- scala-2.11
-
-
org.scala-lang.modules
diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml
index f65044e6faf..378c980909a 100644
--- a/zeppelin-distribution/pom.xml
+++ b/zeppelin-distribution/pom.xml
@@ -114,10 +114,6 @@
scala-2.11
-
- scala-2.11
-
-
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index 76fb72b8b69..64e06b2904b 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -413,10 +413,6 @@
scala-2.11
-
- scala-2.11
-
-