This is an automated email from the ASF dual-hosted git repository.
jongyoul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new f4dcdfdf61 [MINOR] Fix missing changed versions (#4737)
f4dcdfdf61 is described below
commit f4dcdfdf613cb7b9d03555082fd3f14ccdd2fd1a
Author: Cheng Pan <cheng...@apache.org>
AuthorDate: Fri Mar 29 10:45:43 2024 +0800
[MINOR] Fix missing changed versions (#4737)
* [MINOR] Fix missing changed versions
* nit
---
.appveyor.yml | 2 +-
conf/interpreter-list | 36 ++++++++++----------
dev/change_zeppelin_version.sh | 6 ++++
docs/usage/interpreter/installation.md | 61 ++++++++++------------------------
scripts/docker/zeppelin/bin/Dockerfile | 2 +-
5 files changed, 44 insertions(+), 63 deletions(-)
diff --git a/.appveyor.yml b/.appveyor.yml
index f76eecfabd..52395be924 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 0c27153953..fe4b5aae80 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 00ac88a177..0acebba586 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 abaa9624d8..3b378034fa 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:
-
-<table class="table-configuration">
- <tr>
- <th>Name</th>
- <th>Maven Artifact for Scala 2.10</th>
- <th>Maven Artifact for Scala 2.11</th>
- </tr>
- <tr>
- <td>spark</td>
- <td>org.apache.zeppelin:zeppelin-spark_2.10:0.10.0</td>
- <td>org.apache.zeppelin:zeppelin-spark_2.11:0.10.0</td>
- </tr>
-</table>
-
-#### 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
-```
-
<br />
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
</tr>
<tr>
<td>alluxio</td>
- <td>org.apache.zeppelin:zeppelin-alluxio:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-alluxio:0.12.0-SNAPSHOT</td>
<td>Alluxio interpreter</td>
</tr>
<tr>
<td>angular</td>
- <td>org.apache.zeppelin:zeppelin-angular:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-angular:0.12.0-SNAPSHOT</td>
<td>HTML and AngularJS view rendering</td>
</tr>
<tr>
<td>bigquery</td>
- <td>org.apache.zeppelin:zeppelin-bigquery:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-bigquery:0.12.0-SNAPSHOT</td>
<td>BigQuery interpreter</td>
</tr>
<tr>
<td>cassandra</td>
- <td>org.apache.zeppelin:zeppelin-cassandra:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-cassandra:0.12.0-SNAPSHOT</td>
<td>Cassandra interpreter</td>
</tr>
<tr>
<td>elasticsearch</td>
- <td>org.apache.zeppelin:zeppelin-elasticsearch:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-elasticsearch:0.12.0-SNAPSHOT</td>
<td>Elasticsearch interpreter</td>
</tr>
<tr>
<td>file</td>
- <td>org.apache.zeppelin:zeppelin-file:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-file:0.12.0-SNAPSHOT</td>
<td>HDFS file interpreter</td>
</tr>
<tr>
<td>flink</td>
- <td>org.apache.zeppelin:zeppelin-flink:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-flink:0.12.0-SNAPSHOT</td>
<td>Flink interpreter</td>
</tr>
<tr>
<td>hbase</td>
- <td>org.apache.zeppelin:zeppelin-hbase:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-hbase:0.12.0-SNAPSHOT</td>
<td>Hbase interpreter</td>
</tr>
<tr>
<td>groovy</td>
- <td>org.apache.zeppelin:zeppelin-groovy:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-groovy:0.12.0-SNAPSHOT</td>
<td>Groovy interpreter</td>
</tr>
<tr>
<td>java</td>
- <td>org.apache.zeppelin:zeppelin-java:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-java:0.12.0-SNAPSHOT</td>
<td>Java interpreter</td>
</tr>
<tr>
<td>jdbc</td>
- <td>org.apache.zeppelin:zeppelin-jdbc:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-jdbc:0.12.0-SNAPSHOT</td>
<td>Jdbc interpreter</td>
</tr>
<tr>
<td>livy</td>
- <td>org.apache.zeppelin:zeppelin-livy:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-livy:0.12.0-SNAPSHOT</td>
<td>Livy interpreter</td>
</tr>
<tr>
<td>md</td>
- <td>org.apache.zeppelin:zeppelin-markdown:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-markdown:0.12.0-SNAPSHOT</td>
<td>Markdown support</td>
</tr>
<tr>
<td>neo4j</td>
- <td>org.apache.zeppelin:zeppelin-neo4j:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-neo4j:0.12.0-SNAPSHOT</td>
<td>Neo4j interpreter</td>
</tr>
<tr>
<td>python</td>
- <td>org.apache.zeppelin:zeppelin-python:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-python:0.12.0-SNAPSHOT</td>
<td>Python interpreter</td>
</tr>
<tr>
<td>shell</td>
- <td>org.apache.zeppelin:zeppelin-shell:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-shell:0.12.0-SNAPSHOT</td>
<td>Shell command</td>
</tr>
<tr>
<td>sparql</td>
- <td>org.apache.zeppelin:zeppelin-sparql:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-sparql:0.12.0-SNAPSHOT</td>
<td>Sparql interpreter</td>
</tr>
<tr>
<td>submarine</td>
- <td>org.apache.zeppelin:zeppelin-submarine:0.10.0</td>
+ <td>org.apache.zeppelin:zeppelin-submarine:0.12.0-SNAPSHOT</td>
<td>Submarine interpreter</td>
</tr>
</table>
diff --git a/scripts/docker/zeppelin/bin/Dockerfile
b/scripts/docker/zeppelin/bin/Dockerfile
index 5b82b9ad05..f508a2de1c 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 <d...@zeppelin.apache.org>"
-ENV Z_VERSION="0.10.0"
+ENV Z_VERSION="0.12.0-SNAPSHOT"
ENV LOG_TAG="[ZEPPELIN_${Z_VERSION}]:" \
ZEPPELIN_HOME="/opt/zeppelin" \
