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 be80ab7d4 BIGTOP-4273. Upgrade HBase to 2.6.1. (#1307)
be80ab7d4 is described below
commit be80ab7d4660631d4d947297b08f91293d7e9d52
Author: Kengo Seki <[email protected]>
AuthorDate: Mon Nov 25 14:09:11 2024 +0900
BIGTOP-4273. Upgrade HBase to 2.6.1. (#1307)
---
.../common/hbase/patch0-HBASE-27065-2.4.13.diff | 251 ---------------------
.../hbase/patch0-upgrade-maven-site-plugin.diff | 13 ++
.../common/hbase/patch2-HBASE-27860-2.4.13.diff | 23 --
bigtop.bom | 2 +-
4 files changed, 14 insertions(+), 275 deletions(-)
diff --git a/bigtop-packages/src/common/hbase/patch0-HBASE-27065-2.4.13.diff
b/bigtop-packages/src/common/hbase/patch0-HBASE-27065-2.4.13.diff
deleted file mode 100644
index 21ed3d15c..000000000
--- a/bigtop-packages/src/common/hbase/patch0-HBASE-27065-2.4.13.diff
+++ /dev/null
@@ -1,251 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index 97d1c283dd..679206e019 100755
---- a/pom.xml
-+++ b/pom.xml
-@@ -3510,6 +3510,14 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3542,6 +3550,14 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3575,6 +3591,14 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3619,6 +3643,22 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.fusesource.leveldbjni</groupId>
-+ <artifactId>leveldbjni-all</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.openlabtesting.leveldbjni</groupId>
-+ <artifactId>leveldbjni-all</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3670,6 +3710,14 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
-@@ -3678,6 +3726,14 @@
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>org.fusesource.leveldbjni</groupId>
-+ <artifactId>leveldbjni-all</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.openlabtesting.leveldbjni</groupId>
-+ <artifactId>leveldbjni-all</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3727,13 +3783,34 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
-+ <!--
-+ Needed in test context when hadoop-3.3 runs.
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
-+ -->
-+ <exclusion>
-+ <groupId>org.fusesource.leveldbjni</groupId>
-+ <artifactId>leveldbjni-all</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.openlabtesting.leveldbjni</groupId>
-+ <artifactId>leveldbjni-all</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-+ <!-- Is this needed? Seems a duplicate of the above dependency
but for the
-+ classifier-->
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop-three.version}</version>
-@@ -3745,6 +3822,30 @@
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-log4j12</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>log4j</groupId>
-+ <artifactId>log4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.fusesource.leveldbjni</groupId>
-+ <artifactId>leveldbjni-all</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.openlabtesting.leveldbjni</groupId>
-+ <artifactId>leveldbjni-all</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3768,6 +3869,14 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3835,6 +3944,14 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3905,6 +4022,14 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3975,6 +4100,22 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.fusesource.leveldbjni</groupId>
-+ <artifactId>leveldbjni-all</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.openlabtesting.leveldbjni</groupId>
-+ <artifactId>leveldbjni-all</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3991,6 +4132,14 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>ch.qos.reload4j</groupId>
-+ <artifactId>reload4j</artifactId>
-+ </exclusion>
-+ <exclusion>
-+ <groupId>org.slf4j</groupId>
-+ <artifactId>slf4j-reload4j</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
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
new file mode 100644
index 000000000..e10b48c74
--- /dev/null
+++ b/bigtop-packages/src/common/hbase/patch0-upgrade-maven-site-plugin.diff
@@ -0,0 +1,13 @@
+diff --git a/pom.xml b/pom.xml
+index 01123cb35b..b31202493e 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -658,7 +658,7 @@
+ <wagon.ssh.version>2.12</wagon.ssh.version>
+ <xml.maven.version>1.0.1</xml.maven.version>
+ <spotless.version>2.27.2</spotless.version>
+- <maven-site.version>3.12.0</maven-site.version>
++ <maven-site.version>3.12.1</maven-site.version>
+ <!-- compression -->
+ <aircompressor.version>0.27</aircompressor.version>
+ <brotli4j.version>1.11.0</brotli4j.version>
diff --git a/bigtop-packages/src/common/hbase/patch2-HBASE-27860-2.4.13.diff
b/bigtop-packages/src/common/hbase/patch2-HBASE-27860-2.4.13.diff
deleted file mode 100644
index dbbb64aab..000000000
--- a/bigtop-packages/src/common/hbase/patch2-HBASE-27860-2.4.13.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
-index d71b011..6477a16 100644
---- a/hbase-shaded/pom.xml
-+++ b/hbase-shaded/pom.xml
-@@ -130,6 +130,18 @@
- <relocations>
- <!-- top level com not including sun-->
- <relocation>
-+ <pattern>com.sun.istack</pattern>
-+
<shadedPattern>${shaded.prefix}.com.sun.istack</shadedPattern>
-+ </relocation>
-+ <relocation>
-+ <pattern>com.sun.jersey</pattern>
-+
<shadedPattern>${shaded.prefix}.com.sun.jersey</shadedPattern>
-+ </relocation>
-+ <relocation>
-+ <pattern>com.sun.xml</pattern>
-+
<shadedPattern>${shaded.prefix}.com.sun.xml</shadedPattern>
-+ </relocation>
-+ <relocation>
- <pattern>com.cedarsoftware</pattern>
-
<shadedPattern>${shaded.prefix}.com.cedarsoftware</shadedPattern>
- </relocation>
diff --git a/bigtop.bom b/bigtop.bom
index 3b5131922..ee0fad141 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.4.17'; pkg = base; release = 1 }
+ version { base = '2.6.1'; pkg = base; release = 1 }
tarball { destination = "${name}-${version.base}.tar.gz"
source = "${name}-${version.base}-src.tar.gz" }
url { download_path = "/$name/${version.base}/"
