From e2096a114ae261fcc52db26ef2090cfea734d180 Mon Sep 17 00:00:00 2001 From: Masatake Iwasaki Date: Thu, 5 Feb 2026 10:28:44 +0900 Subject: [PATCH] BIGTOP-4515. Upgrade HBase to 2.6.4. --- bigtop-packages/src/common/hbase/do-component-build | 4 +--- .../src/common/hbase/patch0-upgrade-maven-site-plugin.diff | 6 +++--- bigtop-packages/src/rpm/hbase/SPECS/hbase.spec | 1 + bigtop.bom | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) mode change 100644 => 100755 bigtop-packages/src/rpm/hbase/SPECS/hbase.spec diff --git a/bigtop-packages/src/common/hbase/do-component-build b/bigtop-packages/src/common/hbase/do-component-build index fe3d25873f..1d6b308b0c 100644 --- a/bigtop-packages/src/common/hbase/do-component-build +++ b/bigtop-packages/src/common/hbase/do-component-build @@ -20,10 +20,8 @@ set -ex export MAVEN_OPTS="-Xmx1024m" -MVN_ARGS="-Phadoop-3.0 " +MVN_ARGS="-Dhadoop.profile=3.0 " MVN_ARGS+="-Dhadoop-three.version=${HADOOP_VERSION} " -MVN_ARGS+="-Dhadoop.guava.version=27.0-jre " -MVN_ARGS+="-Djetty.version=9.3.29.v20201019 " MVN_ARGS+="-Dzookeeper.version=${ZOOKEEPER_VERSION} " MVN_ARGS+="-DskipTests " MVN_ARGS+="-Dcheckstyle.skip=true " diff --git a/bigtop-packages/src/common/hbase/patch0-upgrade-maven-site-plugin.diff b/bigtop-packages/src/common/hbase/patch0-upgrade-maven-site-plugin.diff index e10b48c74d..19b93c511e 100644 --- a/bigtop-packages/src/common/hbase/patch0-upgrade-maven-site-plugin.diff +++ b/bigtop-packages/src/common/hbase/patch0-upgrade-maven-site-plugin.diff @@ -1,11 +1,11 @@ diff --git a/pom.xml b/pom.xml -index 01123cb35b..b31202493e 100644 +index 68409106bb..9b4e7704e9 100644 --- a/pom.xml +++ b/pom.xml -@@ -658,7 +658,7 @@ +@@ -663,7 +663,7 @@ 2.12 1.0.1 - 2.27.2 + 2.44.4 - 3.12.0 + 3.12.1 diff --git a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec old mode 100644 new mode 100755 index 147eb35ac5..05a3d6a599 --- a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec +++ b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec @@ -342,6 +342,7 @@ do # Region servers start from a different template that allows # them to run multiple concurrent instances of the daemon %__cp %{SOURCE7} $init_file + chmod 755 $init_file %__sed -i -e "s|@INIT_DEFAULT_START@|3 4 5|" $init_file %__sed -i -e "s|@INIT_DEFAULT_STOP@|0 1 2 6|" $init_file %__sed -i -e "s|@CHKCONFIG@|345 87 13|" $init_file diff --git a/bigtop.bom b/bigtop.bom index 0a958d9cdc..8155fe1fed 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -168,7 +168,7 @@ bigtop { name = 'hbase' rpm_pkg_suffix = "_" + bigtop.base_version.replace(".", "_") relNotes = 'Apache HBase' - version { base = '2.6.2'; pkg = base; release = 1 } + version { base = '2.6.4'; pkg = base; release = 1 } tarball { destination = "${name}-${version.base}.tar.gz" source = "${name}-${version.base}-src.tar.gz" } url { download_path = "/$name/${version.base}/"