Skip to content

Commit 0bb7f02

Browse files
authored
feat: Bump dependencies to the latest patch level for HBase 2.6.1 and 2.6.2 (#1185)
1 parent 44e0445 commit 0bb7f02

7 files changed

+26
-23
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ All notable changes to this project will be documented in this file.
8989
- zookeeper: Enable custom versions ([#1169]).
9090
- opa: Enable custom versions ([#1170]).
9191
- use custom product versions for Hadoop, HBase, Phoenix, hbase-operator-tools, Druid, Hive and Spark ([#1173]).
92+
- hbase: Bump dependencies to the latest patch level for HBase `2.6.1` and `2.6.2` ([#1185]).
9293

9394
### Fixed
9495

@@ -204,6 +205,7 @@ All notable changes to this project will be documented in this file.
204205
[#1179]: https://github.com/stackabletech/docker-images/pull/1179
205206
[#1180]: https://github.com/stackabletech/docker-images/pull/1180
206207
[#1184]: https://github.com/stackabletech/docker-images/pull/1184
208+
[#1185]: https://github.com/stackabletech/docker-images/pull/1185
207209

208210
## [25.3.0] - 2025-03-21
209211

hbase/hbase/stackable/patches/2.6.1/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8b8b17064695f7c631ef3abd79351d756b155dd1 Mon Sep 17 00:00:00 2001
1+
From b2cccc639680890cf595ddd217dff2dcbf10c04b Mon Sep 17 00:00:00 2001
22
From: Lars Francke <lars.francke@stackable.tech>
33
Date: Thu, 11 Jul 2024 10:12:51 +0200
44
Subject: Update all dependencies which have a new patch update available.
@@ -8,15 +8,15 @@ Subject: Update all dependencies which have a new patch update available.
88
1 file changed, 24 insertions(+), 24 deletions(-)
99

1010
diff --git a/pom.xml b/pom.xml
11-
index 01123cb35b..3734fb1142 100644
11+
index 01123cb35b..e78b9eb5d5 100644
1212
--- a/pom.xml
1313
+++ b/pom.xml
1414
@@ -567,7 +567,7 @@
1515
modules and cause trouble if we only rely on transitive dependencies.
1616
-->
1717
<netty3.version>3.10.6.Final</netty3.version>
1818
- <netty4.version>4.1.112.Final</netty4.version>
19-
+ <netty4.version>4.1.117.Final</netty4.version>
19+
+ <netty4.version>4.1.122.Final</netty4.version>
2020
<!-- end HBASE-15925 default hadoop compatibility values -->
2121
<audience-annotations.version>0.13.0</audience-annotations.version>
2222
<!--
@@ -76,8 +76,8 @@ index 01123cb35b..3734fb1142 100644
7676
- <spy.version>2.12.2</spy.version>
7777
- <bouncycastle.version>1.78</bouncycastle.version>
7878
- <skyscreamer.version>1.5.1</skyscreamer.version>
79-
+ <joni.version>2.2.3</joni.version>
80-
+ <jcodings.version>1.0.61</jcodings.version>
79+
+ <joni.version>2.2.6</joni.version>
80+
+ <jcodings.version>1.0.63</jcodings.version>
8181
+ <spy.version>2.12.3</spy.version>
8282
+ <bouncycastle.version>1.78.1</bouncycastle.version>
8383
+ <skyscreamer.version>1.5.3</skyscreamer.version>
@@ -116,7 +116,7 @@ index 01123cb35b..3734fb1142 100644
116116
- <snappy.version>1.1.10.4</snappy.version>
117117
- <zstd-jni.version>1.5.5-2</zstd-jni.version>
118118
+ <snappy.version>1.1.10.7</snappy.version>
119-
+ <zstd-jni.version>1.5.6-9</zstd-jni.version>
119+
+ <zstd-jni.version>1.5.7-3</zstd-jni.version>
120120
<!--
121121
Note that the version of protobuf shipped in hbase-thirdparty must match the version used
122122
in hbase-protocol-shaded and hbase-examples. The version of jackson-[annotations,core,

hbase/hbase/stackable/patches/2.6.1/0003-Include-jackson-dataformat-xml.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 056084630f50ba09e9a078aa9152b6c4f8550f3c Mon Sep 17 00:00:00 2001
1+
From 21b16c876a30be29ad8450f1092b676137e2a0d1 Mon Sep 17 00:00:00 2001
22
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
33
Date: Fri, 12 Jul 2024 17:30:12 -0400
44
Subject: Include jackson-dataformat-xml.
@@ -28,7 +28,7 @@ index 1564851b85..0786288a84 100644
2828
<groupId>org.apache.logging.log4j</groupId>
2929
<artifactId>log4j-slf4j-impl</artifactId>
3030
diff --git a/pom.xml b/pom.xml
31-
index 3734fb1142..ff1b35986b 100644
31+
index e78b9eb5d5..69bdb12b71 100644
3232
--- a/pom.xml
3333
+++ b/pom.xml
3434
@@ -1159,6 +1159,11 @@

hbase/hbase/stackable/patches/2.6.1/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From e8cfb60570a094f21d0ac3f13b600180770ad2bd Mon Sep 17 00:00:00 2001
1+
From cd7a88298fab77b973ed46f80db5df16eb5b010c Mon Sep 17 00:00:00 2001
22
From: Lukas Voetmand <lukas.voetmand@stackable.tech>
33
Date: Fri, 6 Sep 2024 17:53:52 +0200
44
Subject: Bump cyclonedx-maven-plugin to version 2.9.1 and tweak its
@@ -9,7 +9,7 @@ Subject: Bump cyclonedx-maven-plugin to version 2.9.1 and tweak its
99
1 file changed, 5 insertions(+), 1 deletion(-)
1010

1111
diff --git a/pom.xml b/pom.xml
12-
index ff1b35986b..5ce072ab36 100644
12+
index 69bdb12b71..fe1bc7ab8e 100644
1313
--- a/pom.xml
1414
+++ b/pom.xml
1515
@@ -3290,7 +3290,11 @@

hbase/hbase/stackable/patches/2.6.2/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
From fc26f5691405aac908f4ecfa4682d53b1916bc07 Mon Sep 17 00:00:00 2001
1+
From d50dc29c05f49b9eb44fc149a5533faa6595d922 Mon Sep 17 00:00:00 2001
22
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
33
Date: Tue, 6 May 2025 13:11:25 +0200
44
Subject: Update all dependencies which have a new patch update available
55

66
---
7-
pom.xml | 42 +++++++++++++++++++++---------------------
8-
1 file changed, 21 insertions(+), 21 deletions(-)
7+
pom.xml | 44 ++++++++++++++++++++++----------------------
8+
1 file changed, 22 insertions(+), 22 deletions(-)
99

1010
diff --git a/pom.xml b/pom.xml
11-
index e4be54a0ad..6202b48156 100644
11+
index e4be54a0ad..7d40196351 100644
1212
--- a/pom.xml
1313
+++ b/pom.xml
1414
@@ -566,7 +566,7 @@
1515
in the dependencyManagement section as it could still lead to different versions of netty
1616
modules and cause trouble if we only rely on transitive dependencies.
1717
-->
1818
- <netty4.version>4.1.116.Final</netty4.version>
19-
+ <netty4.version>4.1.117.Final</netty4.version>
19+
+ <netty4.version>4.1.122.Final</netty4.version>
2020
<!-- end HBASE-15925 default hadoop compatibility values -->
2121
<audience-annotations.version>0.13.0</audience-annotations.version>
2222
<!--
@@ -48,8 +48,9 @@ index e4be54a0ad..6202b48156 100644
4848
<jaxb-api.version>2.3.1</jaxb-api.version>
4949
<servlet.api.version>3.1.0</servlet.api.version>
5050
<wx.rs.api.version>2.1.1</wx.rs.api.version>
51-
<tomcat.jasper.version>9.0.93</tomcat.jasper.version>
51+
- <tomcat.jasper.version>9.0.93</tomcat.jasper.version>
5252
- <jruby.version>9.3.13.0</jruby.version>
53+
+ <tomcat.jasper.version>9.0.106</tomcat.jasper.version>
5354
+ <jruby.version>9.3.15.0</jruby.version>
5455
<junit.version>4.13.2</junit.version>
5556
<hamcrest.version>1.3</hamcrest.version>
@@ -70,8 +71,8 @@ index e4be54a0ad..6202b48156 100644
7071
<!--Make sure these joni/jcodings are compatible with the versions used by jruby-->
7172
- <joni.version>2.2.1</joni.version>
7273
- <jcodings.version>1.0.58</jcodings.version>
73-
+ <joni.version>2.2.3</joni.version>
74-
+ <jcodings.version>1.0.61</jcodings.version>
74+
+ <joni.version>2.2.6</joni.version>
75+
+ <jcodings.version>1.0.63</jcodings.version>
7576
<spy.version>2.12.3</spy.version>
7677
- <bouncycastle.version>1.78</bouncycastle.version>
7778
- <skyscreamer.version>1.5.1</skyscreamer.version>
@@ -112,7 +113,7 @@ index e4be54a0ad..6202b48156 100644
112113
- <snappy.version>1.1.10.4</snappy.version>
113114
- <zstd-jni.version>1.5.5-2</zstd-jni.version>
114115
+ <snappy.version>1.1.10.7</snappy.version>
115-
+ <zstd-jni.version>1.5.6-9</zstd-jni.version>
116+
+ <zstd-jni.version>1.5.7-3</zstd-jni.version>
116117
<!--
117118
Note that the version of protobuf shipped in hbase-thirdparty must match the version used
118119
in hbase-protocol-shaded and hbase-examples. The version of jackson-[annotations,core,

hbase/hbase/stackable/patches/2.6.2/0003-Include-jackson-dataformat-xml.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5bb92637f453cca489eacda30aac781b60105430 Mon Sep 17 00:00:00 2001
1+
From d374ae35545500652411db02a9661dc884d6e8e1 Mon Sep 17 00:00:00 2001
22
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
33
Date: Fri, 12 Jul 2024 17:30:12 -0400
44
Subject: Include jackson-dataformat-xml.
@@ -28,7 +28,7 @@ index 459d3d2cb9..a5ae653d02 100644
2828
<groupId>org.apache.logging.log4j</groupId>
2929
<artifactId>log4j-slf4j-impl</artifactId>
3030
diff --git a/pom.xml b/pom.xml
31-
index 6202b48156..c1619999a5 100644
31+
index 7d40196351..c907686136 100644
3232
--- a/pom.xml
3333
+++ b/pom.xml
3434
@@ -1157,6 +1157,11 @@

hbase/hbase/stackable/patches/2.6.2/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From c6ddaa5ab1a75d001941276fbd715b1b8ab9d8e0 Mon Sep 17 00:00:00 2001
1+
From 50f6936c35406b4e652ccc08ae7e386d8ca3fc48 Mon Sep 17 00:00:00 2001
22
From: Lukas Voetmand <lukas.voetmand@stackable.tech>
33
Date: Fri, 6 Sep 2024 17:53:52 +0200
44
Subject: Bump cyclonedx-maven-plugin to version 2.9.1 and tweak its
@@ -9,7 +9,7 @@ Subject: Bump cyclonedx-maven-plugin to version 2.9.1 and tweak its
99
1 file changed, 5 insertions(+), 1 deletion(-)
1010

1111
diff --git a/pom.xml b/pom.xml
12-
index c1619999a5..808a768937 100644
12+
index c907686136..c1fba4ab9a 100644
1313
--- a/pom.xml
1414
+++ b/pom.xml
1515
@@ -3275,7 +3275,11 @@

0 commit comments

Comments
 (0)