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/07/25 03:57:10 UTC
[bigtop] branch master updated: BIGTOP-3755. Bump HBase to 2.4.13. (#960)
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 f8ad41ab BIGTOP-3755. Bump HBase to 2.4.13. (#960)
f8ad41ab is described below
commit f8ad41abbf2d85bc21e41a1095689303657bf26e
Author: Masatake Iwasaki <iw...@apache.org>
AuthorDate: Mon Jul 25 12:57:05 2022 +0900
BIGTOP-3755. Bump HBase to 2.4.13. (#960)
---
...-2.4.12.diff => patch0-HBASE-27065-2.4.13.diff} | 191 +++++++++++----------
bigtop.bom | 2 +-
2 files changed, 99 insertions(+), 94 deletions(-)
diff --git a/bigtop-packages/src/common/hbase/patch0-HBASE-27065-2.4.12.diff b/bigtop-packages/src/common/hbase/patch0-HBASE-27065-2.4.13.diff
similarity index 67%
rename from bigtop-packages/src/common/hbase/patch0-HBASE-27065-2.4.12.diff
rename to bigtop-packages/src/common/hbase/patch0-HBASE-27065-2.4.13.diff
index c3c2df6c..21ed3d15 100644
--- a/bigtop-packages/src/common/hbase/patch0-HBASE-27065-2.4.12.diff
+++ b/bigtop-packages/src/common/hbase/patch0-HBASE-27065-2.4.13.diff
@@ -1,8 +1,8 @@
diff --git a/pom.xml b/pom.xml
-index d9c3475caf..4fae9b8dfa 100755
+index 97d1c283dd..679206e019 100755
--- a/pom.xml
+++ b/pom.xml
-@@ -3139,6 +3139,14 @@
+@@ -3510,6 +3510,14 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
@@ -14,13 +14,13 @@ index d9c3475caf..4fae9b8dfa 100755
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3171,6 +3179,14 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</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>
@@ -29,10 +29,10 @@ index d9c3475caf..4fae9b8dfa 100755
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3204,6 +3220,14 @@
+ </exclusions>
+ </dependency>
+ <dependency>
+@@ -3575,6 +3591,14 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
@@ -44,13 +44,13 @@ index d9c3475caf..4fae9b8dfa 100755
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3248,6 +3272,22 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</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>
@@ -67,13 +67,13 @@ index d9c3475caf..4fae9b8dfa 100755
+ <groupId>org.openlabtesting.leveldbjni</groupId>
+ <artifactId>leveldbjni-all</artifactId>
+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3299,6 +3339,22 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</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>
@@ -82,6 +82,13 @@ index d9c3475caf..4fae9b8dfa 100755
+ <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>
@@ -90,13 +97,13 @@ index d9c3475caf..4fae9b8dfa 100755
+ <groupId>org.openlabtesting.leveldbjni</groupId>
+ <artifactId>leveldbjni-all</artifactId>
+ </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
-@@ -3356,6 +3412,22 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</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>
@@ -105,6 +112,13 @@ index d9c3475caf..4fae9b8dfa 100755
+ <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>
@@ -113,13 +127,18 @@ index d9c3475caf..4fae9b8dfa 100755
+ <groupId>org.openlabtesting.leveldbjni</groupId>
+ <artifactId>leveldbjni-all</artifactId>
+ </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
-@@ -3374,6 +3446,30 @@
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</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>
@@ -144,13 +163,13 @@ index d9c3475caf..4fae9b8dfa 100755
+ <groupId>org.openlabtesting.leveldbjni</groupId>
+ <artifactId>leveldbjni-all</artifactId>
+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3397,6 +3493,14 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</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>
@@ -159,13 +178,13 @@ index d9c3475caf..4fae9b8dfa 100755
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3464,6 +3568,14 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</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>
@@ -174,27 +193,13 @@ index d9c3475caf..4fae9b8dfa 100755
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3522,10 +3634,13 @@
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
-+ <!--
-+ Needed in test context when hadoop-3.3 runs.
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
-+ -->
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
-@@ -3534,6 +3649,14 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</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>
@@ -203,13 +208,13 @@ index d9c3475caf..4fae9b8dfa 100755
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3604,6 +3727,22 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</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>
@@ -226,13 +231,13 @@ index d9c3475caf..4fae9b8dfa 100755
+ <groupId>org.openlabtesting.leveldbjni</groupId>
+ <artifactId>leveldbjni-all</artifactId>
+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -3620,6 +3759,14 @@
- <groupId>log4j</groupId>
- <artifactId>log4j</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>
@@ -241,6 +246,6 @@ index d9c3475caf..4fae9b8dfa 100755
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
+ </exclusions>
+ </dependency>
+ <dependency>
diff --git a/bigtop.bom b/bigtop.bom
index d56659a0..f054b9da 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -155,7 +155,7 @@ bigtop {
'hbase' {
name = 'hbase'
relNotes = 'Apache HBase'
- version { base = '2.4.12'; pkg = base; release = 1 }
+ version { base = '2.4.13'; pkg = base; release = 1 }
tarball { destination = "${name}-${version.base}.tar.gz"
source = "${name}-${version.base}-src.tar.gz" }
url { download_path = "/$name/${version.base}/"