diff --git a/.appveyor.yml b/.appveyor.yml index f76eecfabd6..52395be924a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -17,7 +17,7 @@ # under the License. # -version: '0.11.0.{build}' +version: '0.12.0.{build}' shallow_clone: true diff --git a/conf/interpreter-list b/conf/interpreter-list index 0c271539535..fe4b5aae800 100644 --- a/conf/interpreter-list +++ b/conf/interpreter-list @@ -17,21 +17,21 @@ # # [name] [maven artifact] [description] -alluxio org.apache.zeppelin:zeppelin-alluxio:0.10.0 Alluxio interpreter -angular org.apache.zeppelin:zeppelin-angular:0.10.0 HTML and AngularJS view rendering -bigquery org.apache.zeppelin:zeppelin-bigquery:0.10.0 BigQuery interpreter -cassandra org.apache.zeppelin:zeppelin-cassandra:0.10.0 Cassandra interpreter -elasticsearch org.apache.zeppelin:zeppelin-elasticsearch:0.10.0 Elasticsearch interpreter -file org.apache.zeppelin:zeppelin-file:0.10.0 HDFS file interpreter -flink org.apache.zeppelin:zeppelin-flink:0.10.0 Flink interpreter -groovy org.apache.zeppelin:zeppelin-groovy:0.10.0 Groovy interpreter -hbase org.apache.zeppelin:zeppelin-hbase:0.10.0 Hbase interpreter -java org.apache.zeppelin:zeppelin-java:0.10.0 Java interpreter -jdbc org.apache.zeppelin:zeppelin-jdbc:0.10.0 Jdbc interpreter -livy org.apache.zeppelin:zeppelin-livy:0.10.0 Livy interpreter -md org.apache.zeppelin:zeppelin-markdown:0.10.0 Markdown support -neo4j org.apache.zeppelin:zeppelin-neo4j:0.10.0 Neo4j interpreter -python org.apache.zeppelin:zeppelin-python:0.10.0 Python interpreter -shell org.apache.zeppelin:zeppelin-shell:0.10.0 Shell command -sparql org.apache.zeppelin:zeppelin-sparql:0.10.0 Sparql interpreter -submarine org.apache.zeppelin:zeppelin-submarine:0.10.0 Submarine interpreter +alluxio org.apache.zeppelin:zeppelin-alluxio:0.12.0-SNAPSHOT Alluxio interpreter +angular org.apache.zeppelin:zeppelin-angular:0.12.0-SNAPSHOT HTML and AngularJS view rendering +bigquery org.apache.zeppelin:zeppelin-bigquery:0.12.0-SNAPSHOT BigQuery interpreter +cassandra org.apache.zeppelin:zeppelin-cassandra:0.12.0-SNAPSHOT Cassandra interpreter +elasticsearch org.apache.zeppelin:zeppelin-elasticsearch:0.12.0-SNAPSHOT Elasticsearch interpreter +file org.apache.zeppelin:zeppelin-file:0.12.0-SNAPSHOT HDFS file interpreter +flink org.apache.zeppelin:zeppelin-flink:0.12.0-SNAPSHOT Flink interpreter +groovy org.apache.zeppelin:zeppelin-groovy:0.12.0-SNAPSHOT Groovy interpreter +hbase org.apache.zeppelin:zeppelin-hbase:0.12.0-SNAPSHOT Hbase interpreter +java org.apache.zeppelin:zeppelin-java:0.12.0-SNAPSHOT Java interpreter +jdbc org.apache.zeppelin:zeppelin-jdbc:0.12.0-SNAPSHOT Jdbc interpreter +livy org.apache.zeppelin:zeppelin-livy:0.12.0-SNAPSHOT Livy interpreter +md org.apache.zeppelin:zeppelin-markdown:0.12.0-SNAPSHOT Markdown support +neo4j org.apache.zeppelin:zeppelin-neo4j:0.12.0-SNAPSHOT Neo4j interpreter +python org.apache.zeppelin:zeppelin-python:0.12.0-SNAPSHOT Python interpreter +shell org.apache.zeppelin:zeppelin-shell:0.12.0-SNAPSHOT Shell command +sparql org.apache.zeppelin:zeppelin-sparql:0.12.0-SNAPSHOT Sparql interpreter +submarine org.apache.zeppelin:zeppelin-submarine:0.12.0-SNAPSHOT Submarine interpreter diff --git a/dev/change_zeppelin_version.sh b/dev/change_zeppelin_version.sh index 00ac88a1778..0acebba586c 100755 --- a/dev/change_zeppelin_version.sh +++ b/dev/change_zeppelin_version.sh @@ -61,6 +61,12 @@ sed -i '' 's/"version": "'"${FROM_VERSION}"'",/"version": "'"${TO_VERSION}"'",/g # Change version in Dockerfile sed -i '' 's/Z_VERSION="'"${FROM_VERSION}"'"/Z_VERSION="'"${TO_VERSION}"'"/g' scripts/docker/zeppelin/bin/Dockerfile +sed -i '' 's/version="'"${FROM_VERSION}"'"/version="'"${TO_VERSION}"'"/g' scripts/docker/zeppelin-interpreter/Dockerfile +sed -i '' 's/version="'"${FROM_VERSION}"'"/version="'"${TO_VERSION}"'"/g' scripts/docker/zeppelin-server/Dockerfile + +# Change version in Kubernetes yaml +sed -i '' 's/zeppelin-interpreter:${FROM_VERSION}/zeppelin-interpreter:${TO_VERSION}/g' k8s/zeppelin-server.yaml +sed -i '' 's/zeppelin-server:${FROM_VERSION}/zeppelin-server:${TO_VERSION}/g' k8s/zeppelin-server.yaml # Change docker image version in configuration sed -i '' sed 's/zeppelin:'"${OLD_VERSION}"'/zeppelin:'"${NEW_VERSION}"'/g' conf/zeppelin-site.xml.template diff --git a/docs/usage/interpreter/installation.md b/docs/usage/interpreter/installation.md index abaa9624d81..3b378034fac 100644 --- a/docs/usage/interpreter/installation.md +++ b/docs/usage/interpreter/installation.md @@ -47,31 +47,6 @@ You can get full list of community managed interpreters by running ./bin/install-interpreter.sh --list ``` -#### Install interpreter built with Scala 2.10 -Zeppelin support both Scala 2.10 and 2.11 for several interpreters as below: - - - - - - - - - - - - -
NameMaven Artifact for Scala 2.10Maven Artifact for Scala 2.11
sparkorg.apache.zeppelin:zeppelin-spark_2.10:0.10.0org.apache.zeppelin:zeppelin-spark_2.11:0.10.0
- -#### 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 earlier than 2.0.0, you need to download Spark interpreter packaged with Scala 2.10. To do so, use follow command: - -```bash -rm -rf ./interpreter/spark -./bin/install-interpreter.sh --name spark --artifact org.apache.zeppelin:zeppelin-spark_2.10:0.10.0 -``` -
Once you have installed interpreters, you need to restart Zeppelin. And then [create interpreter setting](./overview.html#what-is-zeppelin-interpreter) and [bind it with your notebook](./overview.html#what-is-zeppelin-interpreter-setting). @@ -109,92 +84,92 @@ You can also find the below community managed interpreter list in `conf/interpre alluxio - org.apache.zeppelin:zeppelin-alluxio:0.10.0 + org.apache.zeppelin:zeppelin-alluxio:0.12.0-SNAPSHOT Alluxio interpreter angular - org.apache.zeppelin:zeppelin-angular:0.10.0 + org.apache.zeppelin:zeppelin-angular:0.12.0-SNAPSHOT HTML and AngularJS view rendering bigquery - org.apache.zeppelin:zeppelin-bigquery:0.10.0 + org.apache.zeppelin:zeppelin-bigquery:0.12.0-SNAPSHOT BigQuery interpreter cassandra - org.apache.zeppelin:zeppelin-cassandra:0.10.0 + org.apache.zeppelin:zeppelin-cassandra:0.12.0-SNAPSHOT Cassandra interpreter elasticsearch - org.apache.zeppelin:zeppelin-elasticsearch:0.10.0 + org.apache.zeppelin:zeppelin-elasticsearch:0.12.0-SNAPSHOT Elasticsearch interpreter file - org.apache.zeppelin:zeppelin-file:0.10.0 + org.apache.zeppelin:zeppelin-file:0.12.0-SNAPSHOT HDFS file interpreter flink - org.apache.zeppelin:zeppelin-flink:0.10.0 + org.apache.zeppelin:zeppelin-flink:0.12.0-SNAPSHOT Flink interpreter hbase - org.apache.zeppelin:zeppelin-hbase:0.10.0 + org.apache.zeppelin:zeppelin-hbase:0.12.0-SNAPSHOT Hbase interpreter groovy - org.apache.zeppelin:zeppelin-groovy:0.10.0 + org.apache.zeppelin:zeppelin-groovy:0.12.0-SNAPSHOT Groovy interpreter java - org.apache.zeppelin:zeppelin-java:0.10.0 + org.apache.zeppelin:zeppelin-java:0.12.0-SNAPSHOT Java interpreter jdbc - org.apache.zeppelin:zeppelin-jdbc:0.10.0 + org.apache.zeppelin:zeppelin-jdbc:0.12.0-SNAPSHOT Jdbc interpreter livy - org.apache.zeppelin:zeppelin-livy:0.10.0 + org.apache.zeppelin:zeppelin-livy:0.12.0-SNAPSHOT Livy interpreter md - org.apache.zeppelin:zeppelin-markdown:0.10.0 + org.apache.zeppelin:zeppelin-markdown:0.12.0-SNAPSHOT Markdown support neo4j - org.apache.zeppelin:zeppelin-neo4j:0.10.0 + org.apache.zeppelin:zeppelin-neo4j:0.12.0-SNAPSHOT Neo4j interpreter python - org.apache.zeppelin:zeppelin-python:0.10.0 + org.apache.zeppelin:zeppelin-python:0.12.0-SNAPSHOT Python interpreter shell - org.apache.zeppelin:zeppelin-shell:0.10.0 + org.apache.zeppelin:zeppelin-shell:0.12.0-SNAPSHOT Shell command sparql - org.apache.zeppelin:zeppelin-sparql:0.10.0 + org.apache.zeppelin:zeppelin-sparql:0.12.0-SNAPSHOT Sparql interpreter submarine - org.apache.zeppelin:zeppelin-submarine:0.10.0 + org.apache.zeppelin:zeppelin-submarine:0.12.0-SNAPSHOT Submarine interpreter diff --git a/scripts/docker/zeppelin/bin/Dockerfile b/scripts/docker/zeppelin/bin/Dockerfile index 5b82b9ad053..f508a2de1cc 100644 --- a/scripts/docker/zeppelin/bin/Dockerfile +++ b/scripts/docker/zeppelin/bin/Dockerfile @@ -17,7 +17,7 @@ FROM ubuntu:20.04 LABEL maintainer="Apache Software Foundation " -ENV Z_VERSION="0.10.0" +ENV Z_VERSION="0.12.0-SNAPSHOT" ENV LOG_TAG="[ZEPPELIN_${Z_VERSION}]:" \ ZEPPELIN_HOME="/opt/zeppelin" \