Repository: zeppelin Updated Branches: refs/heads/master 6773d0496 -> e8860cffa
[ZEPPELIN-1256][BUILD] Build distribution package with Spark 2.0 and Scala 2.11 ### What is this PR for? - build distribution package with Spark 2.0 and Scala 2.11 - change travis profile to use spark 2.0 instead of 2.0.0-preview by removing `-Dspark.version=2.0.0-preview` property - Change profile activation rule * current way of profile activation is not proper for supporting more than three scala version * -Pscala-2.11 activates both scala-2.10 and scala-2.11 profile without this patch ### What type of PR is it? Build ### What is the Jira issue? [ZEPPELIN-1256](https://issues.apache.org/jira/browse/ZEPPELIN-1256) ### How should this be tested? **Before** Run `mvn help:active-profiles -Pscala-2.11`: ``` Active Profiles for Project 'org.apache.zeppelin:zeppelin:pom:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-interpreter:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-zengine:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-display_2.11:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin-display_2.11:0.7.0-SNAPSHOT) - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-spark-dependencies_2.11:jar:0.7.0-SNAPSHOT': The following profiles are active: - spark-2.0 (source: org.apache.zeppelin:zeppelin-spark-dependencies_2.11:0.7.0-SNAPSHOT) - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-spark_2.11:jar:0.7.0-SNAPSHOT': The following profiles are active: - exclude-sparkr (source: org.apache.zeppelin:zeppelin-spark_2.11:0.7.0-SNAPSHOT) - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-markdown:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-angular:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-shell:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-livy:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-hbase:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-postgresql:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-jdbc:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-file:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-flink_2.11:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-ignite_2.11:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-kylin:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-python:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-lens:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-cassandra_2.11:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-elasticsearch:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-alluxio:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-web:war:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-server:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin-server:0.7.0-SNAPSHOT) - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-distribution:pom:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin-distribution:0.7.0-SNAPSHOT) - scala-2.10 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) ``` **After** Run `mvn help:active-profiles -Dscala-2.11`: ``` Active Profiles for Project 'org.apache.zeppelin:zeppelin:pom:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-interpreter:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-zengine:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-display_2.11:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin-display_2.11:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-spark-dependencies_2.11:jar:0.7.0-SNAPSHOT': The following profiles are active: - spark-2.0 (source: org.apache.zeppelin:zeppelin-spark-dependencies_2.11:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-spark_2.11:jar:0.7.0-SNAPSHOT': The following profiles are active: - exclude-sparkr (source: org.apache.zeppelin:zeppelin-spark_2.11:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-markdown:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-angular:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-shell:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-livy:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-hbase:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-postgresql:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-jdbc:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-file:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-flink_2.11:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-ignite_2.11:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-kylin:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-python:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-lens:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-cassandra_2.11:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-elasticsearch:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-alluxio:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-web:war:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-server:jar:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin-server:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) Active Profiles for Project 'org.apache.zeppelin:zeppelin-distribution:pom:0.7.0-SNAPSHOT': The following profiles are active: - scala-2.11 (source: org.apache.zeppelin:zeppelin-distribution:0.7.0-SNAPSHOT) - scala-2.11 (source: org.apache.zeppelin:zeppelin:0.7.0-SNAPSHOT) ``` ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? yes (for scala 2.11 build) Author: Mina Lee <[email protected]> Closes #1251 from minahlee/ZEPPELIN-1256 and squashes the following commits: ff034c6 [Mina Lee] change scala-2.10 and scala-2.11 profile activation rule 99d91bf [Mina Lee] Update interpreter installation for the user who use Spark version <= 1.6.2 4ca3e7f [Mina Lee] Build distribution package with Spark 2.0 and Scala 2.11 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/e8860cff Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/e8860cff Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/e8860cff Branch: refs/heads/master Commit: e8860cffabb6bc211ae81bc450dfb9e787b30a81 Parents: 6773d04 Author: Mina Lee <[email protected]> Authored: Fri Aug 5 11:07:24 2016 +0900 Committer: Mina Lee <[email protected]> Committed: Fri Aug 5 14:53:23 2016 +0900 ---------------------------------------------------------------------- .travis.yml | 4 ++-- README.md | 2 ++ dev/create_release.sh | 5 +++-- docs/install/install.md | 3 ++- docs/manual/interpreterinstallation.md | 9 +++++++++ pom.xml | 5 +---- r/pom.xml | 5 +---- zeppelin-display/pom.xml | 4 ---- zeppelin-distribution/pom.xml | 4 ---- zeppelin-server/pom.xml | 4 ---- 10 files changed, 20 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e8860cff/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 6013bbf..168193c 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" http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e8860cff/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index d702467..57ea267 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 ``` http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e8860cff/dev/create_release.sh ---------------------------------------------------------------------- diff --git a/dev/create_release.sh b/dev/create_release.sh index 60fc5bd..14688b6 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" http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e8860cff/docs/install/install.md ---------------------------------------------------------------------- diff --git a/docs/install/install.md b/docs/install/install.md index 6450db0..a47e1c6 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 @@ -397,4 +398,4 @@ You can configure Apache Zeppelin with both **environment variables** in `conf/z <td>1024000</td> <td>Size in characters of the maximum text message to be received by websocket.</td> </tr> -</table> \ No newline at end of file +</table> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e8860cff/docs/manual/interpreterinstallation.md ---------------------------------------------------------------------- diff --git a/docs/manual/interpreterinstallation.md b/docs/manual/interpreterinstallation.md index dd182b5..cfd5810 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 +``` + +<br /> 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). http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e8860cff/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 93e6ed9..c0b1935 100644 --- a/pom.xml +++ b/pom.xml @@ -652,7 +652,7 @@ <profile> <id>scala-2.10</id> <activation> - <property><name>!scala-2.11</name></property> + <activeByDefault>true</activeByDefault> </activation> <properties> <scala.version>2.10.5</scala.version> @@ -662,9 +662,6 @@ <profile> <id>scala-2.11</id> - <activation> - <property><name>scala-2.11</name></property> - </activation> <properties> <scala.version>2.11.7</scala.version> <scala.binary.version>2.11</scala.binary.version> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e8860cff/r/pom.xml ---------------------------------------------------------------------- diff --git a/r/pom.xml b/r/pom.xml index 0e7d78d..2dc2eef 100644 --- a/r/pom.xml +++ b/r/pom.xml @@ -380,7 +380,7 @@ <profile> <id>scala-2.10</id> <activation> - <property><name>!scala-2.11</name></property> + <activeByDefault>true</activeByDefault> </activation> <properties> <extra.source.dir>src/main/scala-2.10</extra.source.dir> @@ -390,9 +390,6 @@ <profile> <id>scala-2.11</id> - <activation> - <property><name>scala-2.11</name></property> - </activation> <properties> <extra.source.dir>src/main/scala-2.11</extra.source.dir> <extra.testsource.dir>src/test/scala/scala-2.11</extra.testsource.dir> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e8860cff/zeppelin-display/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml index 47644ee..c30b061 100644 --- a/zeppelin-display/pom.xml +++ b/zeppelin-display/pom.xml @@ -94,10 +94,6 @@ <profiles> <profile> <id>scala-2.11</id> - <activation> - <property><name>scala-2.11</name></property> - </activation> - <dependencies> <dependency> <groupId>org.scala-lang.modules</groupId> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e8860cff/zeppelin-distribution/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml index f65044e..378c980 100644 --- a/zeppelin-distribution/pom.xml +++ b/zeppelin-distribution/pom.xml @@ -114,10 +114,6 @@ <profiles> <profile> <id>scala-2.11</id> - <activation> - <property><name>scala-2.11</name></property> - </activation> - <dependencyManagement> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e8860cff/zeppelin-server/pom.xml ---------------------------------------------------------------------- diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index 76fb72b..64e06b2 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -413,10 +413,6 @@ <profiles> <profile> <id>scala-2.11</id> - <activation> - <property><name>scala-2.11</name></property> - </activation> - <dependencyManagement> <dependencies> <dependency>
