This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 2013a8834 BIGTOP-3987. Upgrade phoenix version to 5.1.3. (#1202)
2013a8834 is described below
commit 2013a8834d86af1d6d3ce8ace8184d5115c6d25e
Author: Kengo Seki <[email protected]>
AuthorDate: Wed Oct 25 18:16:03 2023 +0900
BIGTOP-3987. Upgrade phoenix version to 5.1.3. (#1202)
(cherry picked from commit 71ee33afbaea4ebd1c4e34fc0266b903162d6afc)
---
.../src/common/phoenix/install_phoenix.sh | 5 ++--
.../phoenix/patch0-PHOENIX-6766-branch-5.1.diff | 29 ----------------------
bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec | 2 ++
bigtop.bom | 2 +-
4 files changed, 6 insertions(+), 32 deletions(-)
diff --git a/bigtop-packages/src/common/phoenix/install_phoenix.sh
b/bigtop-packages/src/common/phoenix/install_phoenix.sh
index f661ff143..1b8a77eaa 100755
--- a/bigtop-packages/src/common/phoenix/install_phoenix.sh
+++ b/bigtop-packages/src/common/phoenix/install_phoenix.sh
@@ -115,6 +115,7 @@ install -d -m 0755 $PREFIX/var/log/phoenix
cp $BUILD_DIR/*.jar $PREFIX/$LIB_DIR/
cp -r $BUILD_DIR/bin $PREFIX/$LIB_DIR/
+cp -r $BUILD_DIR/lib $PREFIX/$LIB_DIR/
chmod 755 $PREFIX/$BIN_DIR/*.py
cp -a $BUILD_DIR/{LICENSE,NOTICE} $PREFIX/$DOC_DIR/
@@ -125,7 +126,7 @@ find $PREFIX/$LIB_DIR -name '*.jar' -exec chmod a-x {} \;
# Create version independent symlinks
# phoenix-client for clients like sqlline
-ln -s `cd $PREFIX/$LIB_DIR ; ls phoenix-client*.jar`
$PREFIX/$LIB_DIR/phoenix-client.jar
+ln -s `cd $PREFIX/$LIB_DIR ; ls phoenix-client-embedded-hbase-*-*.jar`
$PREFIX/$LIB_DIR/phoenix-client.jar
# phoenix-server for placing on the HBase regionserver classpath
-ln -s `cd $PREFIX/$LIB_DIR ; ls phoenix-server*.jar`
$PREFIX/$LIB_DIR/phoenix-server.jar
+ln -s `cd $PREFIX/$LIB_DIR ; ls phoenix-server-hbase-*-*.jar`
$PREFIX/$LIB_DIR/phoenix-server.jar
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
deleted file mode 100644
index 623fa9e5b..000000000
--- a/bigtop-packages/src/common/phoenix/patch0-PHOENIX-6766-branch-5.1.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-commit b12f1f2bbc57a5a488eb754697459ff8b486f43a
-Author: Masatake Iwasaki <[email protected]>
-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>
diff --git a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec
b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec
index 1a7b25333..c0a104255 100644
--- a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec
+++ b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec
@@ -14,6 +14,7 @@
# limitations under the License.
%define phoenix_home /usr/lib/%{name}
%define bin_phoenix %{phoenix_home}/bin
+%define lib_phoenix %{phoenix_home}/lib
%define examples_phoenix %{phoenix_home}/examples
%define etc_phoenix_conf %{_sysconfdir}/%{name}/conf
%define etc_phoenix_conf_dist %{etc_phoenix_conf}.dist
@@ -148,5 +149,6 @@ fi
%doc %{doc_phoenix}
%{phoenix_home}/phoenix-*.jar
%{bin_phoenix}
+%{lib_phoenix}
%{examples_phoenix}
%config(noreplace) %{etc_phoenix_conf_dist}
diff --git a/bigtop.bom b/bigtop.bom
index c2078117e..792074800 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -247,7 +247,7 @@ bigtop {
'phoenix' {
name = 'phoenix'
relNotes = 'Apache Phoenix: A SQL skin over HBase'
- version { base = "5.1.2"; pkg = base; release = 1 }
+ version { base = "5.1.3"; pkg = base; release = 1 }
tarball { destination = "$name-${version.base}-src.tar.gz"
source = destination }
url { download_path = "/$name/$name-${version.base}"
