You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by iw...@apache.org on 2022/07/19 08:50:30 UTC
[bigtop] 01/02: BIGTOP-3751. Fix build failure of Zeppelin due to dependency convergence error. (#951)
This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/bigtop.git
commit 1a806bcba1595cd30737255a2125bfb0b2b78d9b
Author: Masatake Iwasaki <iw...@apache.org>
AuthorDate: Tue Jul 19 15:47:56 2022 +0900
BIGTOP-3751. Fix build failure of Zeppelin due to dependency convergence error. (#951)
* BIGTOP-3751. Fix build failure of Zeppelin due to dependency convergence error.
* bumped the release number.
(cherry picked from commit 64f8d92181d1546d18c9c3c4e9c1b57477c2c9db)
---
.../patch3-exclude-conflicting-dependencies.diff | 109 +++++++++++++++++++++
bigtop.bom | 2 +-
2 files changed, 110 insertions(+), 1 deletion(-)
diff --git a/bigtop-packages/src/common/zeppelin/patch3-exclude-conflicting-dependencies.diff b/bigtop-packages/src/common/zeppelin/patch3-exclude-conflicting-dependencies.diff
new file mode 100644
index 00000000..d4443826
--- /dev/null
+++ b/bigtop-packages/src/common/zeppelin/patch3-exclude-conflicting-dependencies.diff
@@ -0,0 +1,109 @@
+diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml
+index 48ce9aa44..560e7c001 100644
+--- a/zeppelin-interpreter/pom.xml
++++ b/zeppelin-interpreter/pom.xml
+@@ -218,6 +218,14 @@
+ <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>
+
+diff --git a/zeppelin-plugins/notebookrepo/filesystem/pom.xml b/zeppelin-plugins/notebookrepo/filesystem/pom.xml
+index f5cb1d579..7238bca20 100644
+--- a/zeppelin-plugins/notebookrepo/filesystem/pom.xml
++++ b/zeppelin-plugins/notebookrepo/filesystem/pom.xml
+@@ -47,6 +47,18 @@
+ <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 f84f3e384..d6fef83e6 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-->
+@@ -303,6 +321,14 @@
+ <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>
+
+diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml
+index 3e789968a..1ee305c3a 100644
+--- a/zeppelin-zengine/pom.xml
++++ b/zeppelin-zengine/pom.xml
+@@ -223,6 +223,18 @@
+ <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>
+
diff --git a/bigtop.bom b/bigtop.bom
index 6dd382fa..48b79773 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -310,7 +310,7 @@ bigtop {
'zeppelin' {
name = 'zeppelin'
relNotes = 'Apache Zeppelin'
- version { base = '0.10.0'; pkg = base; release = 1 }
+ version { base = '0.10.0'; pkg = base; release = 2 }
tarball { source = "$name-${version.base}.tgz"
destination = "$name-${version.base}.tar.gz" }
url { download_path = "/$name/$name-${version.base}/"