This is an automated email from the ASF dual-hosted git repository.
sekikn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new 7fd20a04a BIGTOP-4029. Upgrade Zeppelin to 0.11.0. (#1237)
7fd20a04a is described below
commit 7fd20a04aab7be512f9073253fdc81f2ed1f7596
Author: Kengo Seki <[email protected]>
AuthorDate: Thu Feb 29 10:18:50 2024 +0900
BIGTOP-4029. Upgrade Zeppelin to 0.11.0. (#1237)
---
.../src/common/zeppelin/do-component-build | 28 ++--
.../patch0-exclude-conflicting-packages.diff | 144 ---------------------
.../zeppelin/patch1-installation-permission.diff | 26 ----
...-remove-phantomjs-prebuilt-and-karma-arm64.diff | 15 +--
.../common/zeppelin/patch3-exclude-jaxb-api.diff | 15 ---
.../zeppelin/patch4-exclude-metrics-core.diff | 26 ----
.../smoke-tests/zeppelin/TestZeppelinSmoke.groovy | 2 +-
bigtop.bom | 2 +-
8 files changed, 21 insertions(+), 237 deletions(-)
diff --git a/bigtop-packages/src/common/zeppelin/do-component-build
b/bigtop-packages/src/common/zeppelin/do-component-build
index 149501ac9..bdf5d8183 100644
--- a/bigtop-packages/src/common/zeppelin/do-component-build
+++ b/bigtop-packages/src/common/zeppelin/do-component-build
@@ -18,32 +18,28 @@ set -ex
. `dirname $0`/bigtop.bom
-# Zeppelin doesn't support Scala 2.12+ as of v0.9.0,
-# so we use Scala 2.11 here.
-# Though Zeppelin itself will be built with Scala 2.11,
-# it works with other components built with Scala 2.12,
-# e.g., Spark 3.x, through corresponding interpreters.
-ZEPPELIN_SCALA_BINARY_VERSION=2.11
-./dev/change_scala_version.sh ${ZEPPELIN_SCALA_BINARY_VERSION}
-
# We build Zeppelin with minimal interpreters here
# so as to reduce artifact size (cf. BIGTOP-2269).
# If we include all of these interpreters into
# the artifact, its size is 1.5GB as of v0.9.0,
# while it's around 750MB without them.
# Users can install them later via Zeppelin's "netinst" feature.
-EXCLUDE_INTERPRETERS=!beam,!hbase,!pig,!jdbc,!flink,!ignite,!kylin,!lens,!cassandra,!elasticsearch,!bigquery,!alluxio,!scio,!groovy,!sap,!java,!geode,!neo4j,!hazelcastjet,!submarine,!sparql,!mongodb,!ksql,!scalding
+EXCLUDE_INTERPRETERS=!hbase,!jdbc,!cassandra,!elasticsearch,!bigquery,!alluxio,!groovy,!java,!neo4j,!submarine,!sparql,!mongodb
-# We don't specify scala.version or spark.version here,
-# because Zeppelin builds shims for all of Spark 1.x (w/ Scala 2.10),
-# Spark 2.x (w/ Scala 2.11), and Spark 3.x (w/ Scala 2.12) by default.
-# Rather, explicitly specifying their version seems to cause build failure.
ZEPPELIN_LIVY_VERSION=${LIVY_VERSION}-incubating
-BUILD_OPTS="-Dhadoop3.2.version=${HADOOP_VERSION} \
+ZEPPELIN_SCALA_BINARY_VERSION=${SCALA_VERSION%.*}
+ZEPPELIN_SPARK_VERSION=${SPARK_VERSION%.*}
+
+BUILD_OPTS="-Dhadoop3.3.version=${HADOOP_VERSION} \
+ -Dflink1.16.version=${FLINK_VERSION} \
+ -Dflink.scala.version=${SCALA_VERSION} \
-Dlivy.version=${ZEPPELIN_LIVY_VERSION} \
- -Pscala-${ZEPPELIN_SCALA_BINARY_VERSION} \
+ -Pbuild-distr \
-Phadoop3 \
- -Pbuild-distr"
+ -Pflink-116 \
+ -Pspark-scala-${ZEPPELIN_SCALA_BINARY_VERSION} \
+ -Pspark-${ZEPPELIN_SPARK_VERSION} \
+ -Pweb-dist"
if [ $HOSTTYPE = "powerpc64le" ] ; then
mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc
-Dversion=3.5.0 \
diff --git
a/bigtop-packages/src/common/zeppelin/patch0-exclude-conflicting-packages.diff
b/bigtop-packages/src/common/zeppelin/patch0-exclude-conflicting-packages.diff
deleted file mode 100644
index f31c4cbbf..000000000
---
a/bigtop-packages/src/common/zeppelin/patch0-exclude-conflicting-packages.diff
+++ /dev/null
@@ -1,144 +0,0 @@
-diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml
-index a7b36c92b..bfacb1586 100644
---- a/zeppelin-interpreter/pom.xml
-+++ b/zeppelin-interpreter/pom.xml
-@@ -62,6 +62,10 @@
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>org.ow2.asm</groupId>
-+ <artifactId>asm</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
-
-@@ -209,6 +213,20 @@
- <artifactId>hadoop-client</artifactId>
- <!-- Should always use provided, yarn container
(YarnInterpreterLauncher) will provide all the hadoop jars -->
- <scope>provided</scope>
-+ <exclusions>
-+ <exclusion>
-+ <groupId>org.codehaus.woodstox</groupId>
-+ <artifactId>stax2-api</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ </exclusions>
- </dependency>
-
- <dependency>
-diff --git a/zeppelin-plugins/notebookrepo/filesystem/pom.xml
b/zeppelin-plugins/notebookrepo/filesystem/pom.xml
-index 916c82769..ee134f0dd 100644
---- a/zeppelin-plugins/notebookrepo/filesystem/pom.xml
-+++ b/zeppelin-plugins/notebookrepo/filesystem/pom.xml
-@@ -42,6 +42,24 @@
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
-+ <exclusions>
-+ <exclusion>
-+ <groupId>org.codehaus.woodstox</groupId>
-+ <artifactId>stax2-api</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.eclipse.jetty.websocket</groupId>
-+ <artifactId>websocket-client</artifactId>
-+ </exclusion>
-+ </exclusions>
- </dependency>
- </dependencies>
-
-diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
-index a186d208d..a724c7a63 100644
---- a/zeppelin-server/pom.xml
-+++ b/zeppelin-server/pom.xml
-@@ -290,6 +290,24 @@
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
-+ <exclusions>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>javax.ws.rs</groupId>
-+ <artifactId>javax.ws.rs-api</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.eclipse.jetty.websocket</groupId>
-+ <artifactId>websocket-client</artifactId>
-+ </exclusion>
-+ </exclusions>
- </dependency>
-
- <!--test libraries-->
-@@ -298,6 +316,20 @@
- <artifactId>hadoop-common</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
-+ <exclusions>
-+ <exclusion>
-+ <groupId>org.codehaus.woodstox</groupId>
-+ <artifactId>stax2-api</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ </exclusions>
- </dependency>
-
- <dependency>
-diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml
-index b8c1be2f5..9ef356384 100644
---- a/zeppelin-zengine/pom.xml
-+++ b/zeppelin-zengine/pom.xml
-@@ -218,6 +218,24 @@
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
-+ <exclusions>
-+ <exclusion>
-+ <groupId>org.codehaus.woodstox</groupId>
-+ <artifactId>stax2-api</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.eclipse.jetty.websocket</groupId>
-+ <artifactId>websocket-client</artifactId>
-+ </exclusion>
-+ </exclusions>
- </dependency>
-
- <dependency>
diff --git
a/bigtop-packages/src/common/zeppelin/patch1-installation-permission.diff
b/bigtop-packages/src/common/zeppelin/patch1-installation-permission.diff
deleted file mode 100644
index ff31cc780..000000000
--- a/bigtop-packages/src/common/zeppelin/patch1-installation-permission.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json
-index de83a629d..73d41a3f5 100644
---- a/zeppelin-web/package.json
-+++ b/zeppelin-web/package.json
-@@ -7,7 +7,7 @@
- },
- "scripts": {
- "clean": "rimraf dist && rimraf .tmp",
-- "postinstall": "bower install --silent",
-+ "postinstall": "bower install --silent --allow-root",
- "prebuild": "npm-run-all clean lint:once",
- "build:dist": "npm-run-all prebuild && grunt pre-webpack-dist && webpack
&& grunt post-webpack-dist",
- "build:ci": "npm-run-all prebuild && grunt pre-webpack-ci && webpack &&
grunt post-webpack-dist",
-diff --git a/zeppelin-web/pom.xml b/zeppelin-web/pom.xml
-index 679812435..068aba1a5 100644
---- a/zeppelin-web/pom.xml
-+++ b/zeppelin-web/pom.xml
-@@ -80,7 +80,7 @@
- </goals>
- <configuration>
- <skip>${web.e2e.enabled}</skip>
-- <arguments>install --no-lockfile</arguments>
-+ <arguments>install --no-lockfile --unsafe-perm</arguments>
- </configuration>
- </execution>
-
diff --git
a/bigtop-packages/src/common/zeppelin/patch2-remove-phantomjs-prebuilt-and-karma-arm64.diff
b/bigtop-packages/src/common/zeppelin/patch2-remove-phantomjs-prebuilt-and-karma-arm64.diff
index df730f7ef..ffebcde9f 100644
---
a/bigtop-packages/src/common/zeppelin/patch2-remove-phantomjs-prebuilt-and-karma-arm64.diff
+++
b/bigtop-packages/src/common/zeppelin/patch2-remove-phantomjs-prebuilt-and-karma-arm64.diff
@@ -1,31 +1,30 @@
diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json
-index de83a629d..8676b0192 100644
+index 27f769f05..997509ce8 100644
--- a/zeppelin-web/package.json
+++ b/zeppelin-web/package.json
-@@ -18,11 +18,8 @@
+@@ -18,10 +18,8 @@
"dev:helium": "HELIUM_BUNDLE_DEV=true webpack-dev-server --hot",
"dev:watch": "grunt watch-webpack-dev",
"dev": "npm-run-all --parallel dev:server lint:watch dev:watch",
- "test:watch": "karma start karma.conf.js --single-run=false",
"pree2e": "webdriver-manager update --gecko false --versions.chrome=2.35",
- "e2e": "protractor protractor.conf.js",
-- "pretest": "npm rebuild phantomjs-prebuilt",
- "karma-test": "karma start karma.conf.js"
+ "e2e": "protractor protractor.conf.js"
},
"dependencies": {
- "angular-ui-grid": "4.4.6",
-@@ -80,13 +77,6 @@
+ "mathjax": "2.7.0",
+@@ -117,13 +115,6 @@
"istanbul-instrumenter-loader": "^0.2.0",
- "jasmine-core": "^3.3.0",
+ "jasmine-core": "^3.99.1",
"jasmine-spec-reporter": "^4.2.1",
- "karma": "~3.1.3",
- "karma-coverage": "^1.1.2",
- "karma-jasmine": "~2.0.1",
-- "karma-phantomjs-launcher": "^1.0.4",
- "karma-sourcemap-loader": "^0.3.7",
- "karma-spec-reporter": "0.0.31",
-- "karma-webpack": "^3.0.5",
+- "karma-firefox-launcher": "2.1.2",
+- "karma-webpack": "^4.0.2",
"load-grunt-tasks": "^0.4.0",
"mini-css-extract-plugin": "^0.4.4",
"ng-annotate-loader": "^0.2.0",
diff --git a/bigtop-packages/src/common/zeppelin/patch3-exclude-jaxb-api.diff
b/bigtop-packages/src/common/zeppelin/patch3-exclude-jaxb-api.diff
deleted file mode 100644
index f40f10228..000000000
--- a/bigtop-packages/src/common/zeppelin/patch3-exclude-jaxb-api.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
-index a724c7a63..3f9d7f7ef 100644
---- a/zeppelin-server/pom.xml
-+++ b/zeppelin-server/pom.xml
-@@ -329,6 +329,10 @@
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>javax.xml.bind</groupId>
-+ <artifactId>jaxb-api</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
-
diff --git
a/bigtop-packages/src/common/zeppelin/patch4-exclude-metrics-core.diff
b/bigtop-packages/src/common/zeppelin/patch4-exclude-metrics-core.diff
deleted file mode 100644
index 3cfa7d8ac..000000000
--- a/bigtop-packages/src/common/zeppelin/patch4-exclude-metrics-core.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
-index 3f9d7f7ef..d3386499f 100644
---- a/zeppelin-server/pom.xml
-+++ b/zeppelin-server/pom.xml
-@@ -307,6 +307,10 @@
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-client</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>io.dropwizard.metrics</groupId>
-+ <artifactId>metrics-core</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
-
-@@ -333,6 +337,10 @@
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>io.dropwizard.metrics</groupId>
-+ <artifactId>metrics-core</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
-
diff --git a/bigtop-tests/smoke-tests/zeppelin/TestZeppelinSmoke.groovy
b/bigtop-tests/smoke-tests/zeppelin/TestZeppelinSmoke.groovy
index 7092e83d9..7f7030fd8 100644
--- a/bigtop-tests/smoke-tests/zeppelin/TestZeppelinSmoke.groovy
+++ b/bigtop-tests/smoke-tests/zeppelin/TestZeppelinSmoke.groovy
@@ -38,7 +38,7 @@ class TestZeppelinSmoke {
public void InstallIntperTest() {
sh.exec(ZEPPELIN_HOME
+ "/bin/install-interpreter.sh "
- + "--name cassandra,scio,md,python,flink,hbase,bigquery,jdbc"
+ + "--name cassandra,md,python,flink,hbase,bigquery,jdbc"
);
logError(sh);
assertTrue("Install Interpreter failed." + sh.getOut() + " " +
sh.getErr(), sh.getRet() == 0);
diff --git a/bigtop.bom b/bigtop.bom
index d4fce4e80..c2e95325c 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -314,7 +314,7 @@ bigtop {
name = 'zeppelin'
rpm_pkg_suffix = "_" + bigtop.base_version.replace(".", "_")
relNotes = 'Apache Zeppelin'
- version { base = '0.10.1'; pkg = base; release = 1 }
+ version { base = '0.11.0'; pkg = base; release = 1 }
tarball { source = "$name-${version.base}.tgz"
destination = "$name-${version.base}.tar.gz" }
url { download_path = "/$name/$name-${version.base}/"
