This is an automated email from the ASF dual-hosted git repository.
iwasakims 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 1448d48b BIGTOP-3678. Building Zeppelin fails due to dependency
convergence error. (#897)
1448d48b is described below
commit 1448d48b293442685c56dfdcc90519affeea39d4
Author: Kengo Seki <[email protected]>
AuthorDate: Mon May 2 14:20:59 2022 +0900
BIGTOP-3678. Building Zeppelin fails due to dependency convergence error.
(#897)
---
.../patch0-exclude-conflicting-packages.diff | 79 ++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git
a/bigtop-packages/src/common/zeppelin/patch0-exclude-conflicting-packages.diff
b/bigtop-packages/src/common/zeppelin/patch0-exclude-conflicting-packages.diff
new file mode 100644
index 00000000..8bf68cca
--- /dev/null
+++
b/bigtop-packages/src/common/zeppelin/patch0-exclude-conflicting-packages.diff
@@ -0,0 +1,79 @@
+diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml
+index a7b36c92b..f866e33e5 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,12 @@
+ <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>
++ </exclusions>
+ </dependency>
+
+ <dependency>
+diff --git a/zeppelin-plugins/notebookrepo/filesystem/pom.xml
b/zeppelin-plugins/notebookrepo/filesystem/pom.xml
+index 5c645738e..f5cb1d579 100644
+--- a/zeppelin-plugins/notebookrepo/filesystem/pom.xml
++++ b/zeppelin-plugins/notebookrepo/filesystem/pom.xml
+@@ -42,6 +42,12 @@
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
++ <exclusions>
++ <exclusion>
++ <groupId>org.codehaus.woodstox</groupId>
++ <artifactId>stax2-api</artifactId>
++ </exclusion>
++ </exclusions>
+ </dependency>
+ </dependencies>
+
+diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
+index f719b9b65..f84f3e384 100644
+--- a/zeppelin-server/pom.xml
++++ b/zeppelin-server/pom.xml
+@@ -298,6 +298,12 @@
+ <artifactId>hadoop-common</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
++ <exclusions>
++ <exclusion>
++ <groupId>org.codehaus.woodstox</groupId>
++ <artifactId>stax2-api</artifactId>
++ </exclusion>
++ </exclusions>
+ </dependency>
+
+ <dependency>
+diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml
+index b8c1be2f5..82b7e7171 100644
+--- a/zeppelin-zengine/pom.xml
++++ b/zeppelin-zengine/pom.xml
+@@ -218,6 +218,12 @@
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
++ <exclusions>
++ <exclusion>
++ <groupId>org.codehaus.woodstox</groupId>
++ <artifactId>stax2-api</artifactId>
++ </exclusion>
++ </exclusions>
+ </dependency>
+
+ <dependency>
