You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by gu...@apache.org on 2022/08/10 12:27:48 UTC
[bigtop] branch master updated: BIGTOP-3771. Fix failure of sqlline.py bundled with Phoenix. (#977)
This is an automated email from the ASF dual-hosted git repository.
guyuqi 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 26527668 BIGTOP-3771. Fix failure of sqlline.py bundled with Phoenix. (#977)
26527668 is described below
commit 26527668e0c7e9c88eac1fd932701a26dac6faec
Author: Masatake Iwasaki <iw...@apache.org>
AuthorDate: Wed Aug 10 21:27:42 2022 +0900
BIGTOP-3771. Fix failure of sqlline.py bundled with Phoenix. (#977)
* BIGTOP-3771. Fix failure of sqlline.py bundled with Phoenix.
---
.../phoenix/patch0-PHOENIX-6766-branch-5.1.diff | 29 ++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/bigtop-packages/src/common/phoenix/patch0-PHOENIX-6766-branch-5.1.diff b/bigtop-packages/src/common/phoenix/patch0-PHOENIX-6766-branch-5.1.diff
new file mode 100644
index 00000000..623fa9e5
--- /dev/null
+++ b/bigtop-packages/src/common/phoenix/patch0-PHOENIX-6766-branch-5.1.diff
@@ -0,0 +1,29 @@
+commit b12f1f2bbc57a5a488eb754697459ff8b486f43a
+Author: Masatake Iwasaki <iw...@apache.org>
+Date: Tue Aug 9 12:40:08 2022 +0000
+
+ PHOENIX-6766 Fix failure of sqlline due to conflicting jline dependency pulled from Hadoop 3.3.
+
+diff --git a/pom.xml b/pom.xml
+index cbd8b2f24..74fab1b26 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -811,6 +811,18 @@
+ </exclusions>
+ <version>${hadoop.version}</version>
+ </dependency>
++ <dependency>
++ <groupId>org.apache.hadoop</groupId>
++ <artifactId>hadoop-yarn-client</artifactId>
++ <version>${hadoop.version}</version>
++ <exclusions>
++ <exclusion>
++ <groupId>org.jline</groupId>
++ <artifactId>jline</artifactId>
++ </exclusion>
++ </exclusions>
++ </dependency>
++
+ <!-- Only for shading in phoenix-server - remove ? -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>