Merge branch 'main' into feat/build-kafka-opa-plugin-from-source

dervoeti · dervoeti · commit cf0ea72642b5 · 2025-06-23T20:01:23.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -90,6 +90,7 @@ All notable changes to this project will be documented in this file.
 - zookeeper: Enable custom versions ([#1169]).
 - opa: Enable custom versions ([#1170]).
 - use custom product versions for Hadoop, HBase, Phoenix, hbase-operator-tools, Druid, Hive and Spark ([#1173]).
+- hbase: Bump dependencies to the latest patch level for HBase `2.6.1` and `2.6.2` ([#1185]).
 
 ### Fixed
 
@@ -206,6 +207,7 @@ All notable changes to this project will be documented in this file.
 [#1179]: https://github.com/stackabletech/docker-images/pull/1179
 [#1180]: https://github.com/stackabletech/docker-images/pull/1180
 [#1184]: https://github.com/stackabletech/docker-images/pull/1184
+[#1185]: https://github.com/stackabletech/docker-images/pull/1185
 
 ## [25.3.0] - 2025-03-21
 
diff --git a/hbase/hbase/stackable/patches/2.6.1/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch b/hbase/hbase/stackable/patches/2.6.1/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch
@@ -1,4 +1,4 @@
-From 8b8b17064695f7c631ef3abd79351d756b155dd1 Mon Sep 17 00:00:00 2001
+From b2cccc639680890cf595ddd217dff2dcbf10c04b Mon Sep 17 00:00:00 2001
 From: Lars Francke <lars.francke@stackable.tech>
 Date: Thu, 11 Jul 2024 10:12:51 +0200
 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.
  1 file changed, 24 insertions(+), 24 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 01123cb35b..3734fb1142 100644
+index 01123cb35b..e78b9eb5d5 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -567,7 +567,7 @@
        modules and cause trouble if we only rely on transitive dependencies.
      -->
      <netty3.version>3.10.6.Final</netty3.version>
 -    <netty4.version>4.1.112.Final</netty4.version>
-+    <netty4.version>4.1.117.Final</netty4.version>
++    <netty4.version>4.1.122.Final</netty4.version>
      <!-- end HBASE-15925 default hadoop compatibility values -->
      <audience-annotations.version>0.13.0</audience-annotations.version>
      <!--
@@ -76,8 +76,8 @@ index 01123cb35b..3734fb1142 100644
 -    <spy.version>2.12.2</spy.version>
 -    <bouncycastle.version>1.78</bouncycastle.version>
 -    <skyscreamer.version>1.5.1</skyscreamer.version>
-+    <joni.version>2.2.3</joni.version>
-+    <jcodings.version>1.0.61</jcodings.version>
++    <joni.version>2.2.6</joni.version>
++    <jcodings.version>1.0.63</jcodings.version>
 +    <spy.version>2.12.3</spy.version>
 +    <bouncycastle.version>1.78.1</bouncycastle.version>
 +    <skyscreamer.version>1.5.3</skyscreamer.version>
@@ -116,7 +116,7 @@ index 01123cb35b..3734fb1142 100644
 -    <snappy.version>1.1.10.4</snappy.version>
 -    <zstd-jni.version>1.5.5-2</zstd-jni.version>
 +    <snappy.version>1.1.10.7</snappy.version>
-+    <zstd-jni.version>1.5.6-9</zstd-jni.version>
++    <zstd-jni.version>1.5.7-3</zstd-jni.version>
      <!--
          Note that the version of protobuf shipped in hbase-thirdparty must match the version used
          in hbase-protocol-shaded and hbase-examples. The version of jackson-[annotations,core,
diff --git a/hbase/hbase/stackable/patches/2.6.1/0003-Include-jackson-dataformat-xml.patch b/hbase/hbase/stackable/patches/2.6.1/0003-Include-jackson-dataformat-xml.patch
@@ -1,4 +1,4 @@
-From 056084630f50ba09e9a078aa9152b6c4f8550f3c Mon Sep 17 00:00:00 2001
+From 21b16c876a30be29ad8450f1092b676137e2a0d1 Mon Sep 17 00:00:00 2001
 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
 Date: Fri, 12 Jul 2024 17:30:12 -0400
 Subject: Include jackson-dataformat-xml.
@@ -28,7 +28,7 @@ index 1564851b85..0786288a84 100644
        <groupId>org.apache.logging.log4j</groupId>
        <artifactId>log4j-slf4j-impl</artifactId>
 diff --git a/pom.xml b/pom.xml
-index 3734fb1142..ff1b35986b 100644
+index e78b9eb5d5..69bdb12b71 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1159,6 +1159,11 @@
diff --git a/hbase/hbase/stackable/patches/2.6.1/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch b/hbase/hbase/stackable/patches/2.6.1/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch
@@ -1,4 +1,4 @@
-From e8cfb60570a094f21d0ac3f13b600180770ad2bd Mon Sep 17 00:00:00 2001
+From cd7a88298fab77b973ed46f80db5df16eb5b010c Mon Sep 17 00:00:00 2001
 From: Lukas Voetmand <lukas.voetmand@stackable.tech>
 Date: Fri, 6 Sep 2024 17:53:52 +0200
 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
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/pom.xml b/pom.xml
-index ff1b35986b..5ce072ab36 100644
+index 69bdb12b71..fe1bc7ab8e 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3290,7 +3290,11 @@
diff --git a/hbase/hbase/stackable/patches/2.6.2/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch b/hbase/hbase/stackable/patches/2.6.2/0002-Update-all-dependencies-which-have-a-new-patch-updat.patch
@@ -1,22 +1,22 @@
-From fc26f5691405aac908f4ecfa4682d53b1916bc07 Mon Sep 17 00:00:00 2001
+From d50dc29c05f49b9eb44fc149a5533faa6595d922 Mon Sep 17 00:00:00 2001
 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
 Date: Tue, 6 May 2025 13:11:25 +0200
 Subject: Update all dependencies which have a new patch update available
 
 ---
- pom.xml | 42 +++++++++++++++++++++---------------------
- 1 file changed, 21 insertions(+), 21 deletions(-)
+ pom.xml | 44 ++++++++++++++++++++++----------------------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index e4be54a0ad..6202b48156 100644
+index e4be54a0ad..7d40196351 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -566,7 +566,7 @@
        in the dependencyManagement section as it could still lead to different versions of netty
        modules and cause trouble if we only rely on transitive dependencies.
      -->
 -    <netty4.version>4.1.116.Final</netty4.version>
-+    <netty4.version>4.1.117.Final</netty4.version>
++    <netty4.version>4.1.122.Final</netty4.version>
      <!-- end HBASE-15925 default hadoop compatibility values -->
      <audience-annotations.version>0.13.0</audience-annotations.version>
      <!--
@@ -48,8 +48,9 @@ index e4be54a0ad..6202b48156 100644
      <jaxb-api.version>2.3.1</jaxb-api.version>
      <servlet.api.version>3.1.0</servlet.api.version>
      <wx.rs.api.version>2.1.1</wx.rs.api.version>
-     <tomcat.jasper.version>9.0.93</tomcat.jasper.version>
+-    <tomcat.jasper.version>9.0.93</tomcat.jasper.version>
 -    <jruby.version>9.3.13.0</jruby.version>
++    <tomcat.jasper.version>9.0.106</tomcat.jasper.version>
 +    <jruby.version>9.3.15.0</jruby.version>
      <junit.version>4.13.2</junit.version>
      <hamcrest.version>1.3</hamcrest.version>
@@ -70,8 +71,8 @@ index e4be54a0ad..6202b48156 100644
      <!--Make sure these joni/jcodings are compatible with the versions used by jruby-->
 -    <joni.version>2.2.1</joni.version>
 -    <jcodings.version>1.0.58</jcodings.version>
-+    <joni.version>2.2.3</joni.version>
-+    <jcodings.version>1.0.61</jcodings.version>
++    <joni.version>2.2.6</joni.version>
++    <jcodings.version>1.0.63</jcodings.version>
      <spy.version>2.12.3</spy.version>
 -    <bouncycastle.version>1.78</bouncycastle.version>
 -    <skyscreamer.version>1.5.1</skyscreamer.version>
@@ -112,7 +113,7 @@ index e4be54a0ad..6202b48156 100644
 -    <snappy.version>1.1.10.4</snappy.version>
 -    <zstd-jni.version>1.5.5-2</zstd-jni.version>
 +    <snappy.version>1.1.10.7</snappy.version>
-+    <zstd-jni.version>1.5.6-9</zstd-jni.version>
++    <zstd-jni.version>1.5.7-3</zstd-jni.version>
      <!--
          Note that the version of protobuf shipped in hbase-thirdparty must match the version used
          in hbase-protocol-shaded and hbase-examples. The version of jackson-[annotations,core,
diff --git a/hbase/hbase/stackable/patches/2.6.2/0003-Include-jackson-dataformat-xml.patch b/hbase/hbase/stackable/patches/2.6.2/0003-Include-jackson-dataformat-xml.patch
@@ -1,4 +1,4 @@
-From 5bb92637f453cca489eacda30aac781b60105430 Mon Sep 17 00:00:00 2001
+From d374ae35545500652411db02a9661dc884d6e8e1 Mon Sep 17 00:00:00 2001
 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
 Date: Fri, 12 Jul 2024 17:30:12 -0400
 Subject: Include jackson-dataformat-xml.
@@ -28,7 +28,7 @@ index 459d3d2cb9..a5ae653d02 100644
        <groupId>org.apache.logging.log4j</groupId>
        <artifactId>log4j-slf4j-impl</artifactId>
 diff --git a/pom.xml b/pom.xml
-index 6202b48156..c1619999a5 100644
+index 7d40196351..c907686136 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1157,6 +1157,11 @@
diff --git a/hbase/hbase/stackable/patches/2.6.2/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch b/hbase/hbase/stackable/patches/2.6.2/0004-Bump-cyclonedx-maven-plugin-to-version-2.9.1-and-twe.patch
@@ -1,4 +1,4 @@
-From c6ddaa5ab1a75d001941276fbd715b1b8ab9d8e0 Mon Sep 17 00:00:00 2001
+From 50f6936c35406b4e652ccc08ae7e386d8ca3fc48 Mon Sep 17 00:00:00 2001
 From: Lukas Voetmand <lukas.voetmand@stackable.tech>
 Date: Fri, 6 Sep 2024 17:53:52 +0200
 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
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/pom.xml b/pom.xml
-index c1619999a5..808a768937 100644
+index c907686136..c1fba4ab9a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3275,7 +3275,11 @@
diff --git a/kafka/Dockerfile b/kafka/Dockerfile
@@ -75,7 +75,7 @@ COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-builder /stackable/jmx/ /stack
 COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /stackable/kcat /stackable/bin/kcat-${KAFKA_KCAT}
 COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /stackable/kcat-${KAFKA_KCAT}-src.tar.gz /stackable
 COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /licenses /licenses
-COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-opa-plugin /stackable/src/kafka/kafka-opa-plugin/patchable-work/worktree/${KAFKA_KAFKA_OPA_PLUGIN}/build/libs/opa-authorizer-${KAFKA_KAFKA_OPA_PLUGIN}-all.jar /stackable/kafka_${SCALA}-${PRODUCT}/libs/opa-authorizer-${KAFKA_KAFKA_OPA_PLUGIN}-all.jar
+COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-opa-plugin /stackable/src/kafka/kafka-opa-plugin/patchable-work/worktree/${KAFKA_KAFKA_OPA_PLUGIN}/build/libs/opa-authorizer-${KAFKA_KAFKA_OPA_PLUGIN}-all.jar /stackable/kafka_${SCALA}-${PRODUCT}-stackable${RELEASE}/libs/opa-authorizer-${KAFKA_KAFKA_OPA_PLUGIN}-all.jar
 COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-opa-plugin /stackable/kafka-opa-plugin-${KAFKA_KAFKA_OPA_PLUGIN}-src.tar.gz /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 kafka/licenses /licenses
@@ -106,7 +106,7 @@ chown -h ${STACKABLE_USER_UID}:0 /stackable/kafka
 chmod g=u /stackable/bin
 chmod g=u /stackable/jmx
 chmod g=u /stackable/kafka_${SCALA}-${PRODUCT}-stackable${RELEASE}
-chmod g=u /stackable/kafka_${SCALA}-${PRODUCT}/libs/opa-authorizer-${KAFKA_KAFKA_OPA_PLUGIN}-all.jar
+chmod g=u /stackable/kafka_${SCALA}-${PRODUCT}-stackable${RELEASE}/libs/opa-authorizer-${KAFKA_KAFKA_OPA_PLUGIN}-all.jar
 chmod g=u /stackable/*-src.tar.gz
 EOF
 
