feat(druid): Add version 31.0.1 and 30.0.1, drop 26.0.0, bump druid-opa-authorizer to 0.6.0 (#984)

* feat(druid): Add version 31.0.1

* chore: bump opa-authorizer to 0.6.0

* fix: changelog

* drop druid 26 / add 30.0.1

* Convert Druid 30.0.1 patches to patchable

* Convert Druid 31.0.1 patches to patchable

---------

Co-authored-by: Natalie Klestrup Röijezon <[email protected]>

Author: dervoeti

CHANGELOG.md

@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file.
   util-linux-core contains a basic set of Linux utilities, including the
   command logger which allows to enter messages into the system log.
 - vector: Add version 0.43.1 ([#980]).
+- druid: Add version 30.0.1 and 31.0.1 ([#984])
 - opa: Add version 1.0.1 ([#981], [#1000]).
 - statsd-exporter: Bump version to 0.28.0 ([#982]).
 - git-sync: Bump version to 4.4.0 ([#990]).
@@ -36,7 +37,7 @@ All notable changes to this project will be documented in this file.
 - kafka: Bump 3.8.0 to 3.8.1 ([#995]).
 - Update registry references to oci ([#989]).
 - trino-storage-connector: Move the build out of trino/ for easier patching ([#996]).
-- druid 26.0.0: Migrate to patchable ([#1003]).
+- BREAKING: druid: Bump opa-authorizer to 0.6.0 for all versions ([#984])
 
 ### Removed
 
@@ -47,6 +48,7 @@ All notable changes to this project will be documented in this file.
 - trino-cli: Remove version 469 ([#999]).
 - trino-storage-connector: Remove version 469 ([#999]).
 - nifi: Remove 2.0.0 ([#1006]).
+- druid: Remove 26.0.0 ([#984])
 
 ### Fixed
 
@@ -66,9 +68,10 @@ All notable changes to this project will be documented in this file.
 [#980]: https://github.com/stackabletech/docker-images/pull/980
 [#981]: https://github.com/stackabletech/docker-images/pull/981
 [#982]: https://github.com/stackabletech/docker-images/pull/982
+[#984]: https://github.com/stackabletech/docker-images/pull/984
+[#988]: https://github.com/stackabletech/docker-images/pull/988
 [#989]: https://github.com/stackabletech/docker-images/pull/989
 [#990]: https://github.com/stackabletech/docker-images/pull/990
-[#988]: https://github.com/stackabletech/docker-images/pull/988
 [#991]: https://github.com/stackabletech/docker-images/pull/991
 [#992]: https://github.com/stackabletech/docker-images/pull/992
 [#993]: https://github.com/stackabletech/docker-images/pull/993

druid/Dockerfile

@@ -18,7 +18,7 @@ RUN <<EOF
 microdnf update
 
 # python-pyyaml:
-#   This note was last checked for version 30.0.0
+#   This note was last checked for version 31.0.1
 #   Required for the compilation of Druid.
 #   This requirement is documented in docs/development/build.md and version 5.1 or later is required.
 #   UBI 9 ships with 5.4.x so that should be fine

druid/stackable/patches/26.0.0/0004-Updates-all-dependencies-that-have-a-new-patch-relea.patch

@@ -1,18 +1,18 @@
-From 098e0333cb3977164c62ab0f29aafaf9b1ac6c7c Mon Sep 17 00:00:00 2001
+From 1f18905f78c9c46c7c12c1d705547f00ddbfa1ab Mon Sep 17 00:00:00 2001
 From: Lars Francke <[email protected]>
 Date: Wed, 10 Jul 2024 17:07:13 +0200
 Subject: Removes all traces of the druid ranger extension
 
 ---
- distribution/pom.xml | 4 ----
+ distribution/pom.xml | 2 --
  pom.xml              | 1 -
- 2 files changed, 5 deletions(-)
+ 2 files changed, 3 deletions(-)
 
 diff --git a/distribution/pom.xml b/distribution/pom.xml
-index eec26171af..a6e72cf2c2 100644
+index 1ebfa31f84..9c2cfc8753 100644
 --- a/distribution/pom.xml
 +++ b/distribution/pom.xml
-@@ -255,8 +255,6 @@
+@@ -252,8 +252,6 @@
                                          <argument>-c</argument>
                                          <argument>org.apache.druid.extensions:druid-pac4j</argument>
                                          <argument>-c</argument>
@@ -21,20 +21,11 @@ index eec26171af..a6e72cf2c2 100644
                                          <argument>org.apache.druid.extensions:druid-kubernetes-extensions</argument>
                                          <argument>-c</argument>
                                          <argument>org.apache.druid.extensions:druid-catalog</argument>
-@@ -439,8 +437,6 @@
-                                         <argument>-c</argument>
-                                         <argument>org.apache.druid.extensions:druid-pac4j</argument>
-                                         <argument>-c</argument>
--                                        <argument>org.apache.druid.extensions:druid-ranger-security</argument>
--                                        <argument>-c</argument>
-                                         <argument>org.apache.druid.extensions:druid-kubernetes-extensions</argument>
-                                         <argument>${druid.distribution.pulldeps.opts}</argument>
-                                     </arguments>
 diff --git a/pom.xml b/pom.xml
-index 0c6294f5ed..a33c6bd521 100644
+index 17cd202ea6..08a3f24210 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -186,7 +186,6 @@
+@@ -198,7 +198,6 @@
          <module>extensions-core/simple-client-sslcontext</module>
          <module>extensions-core/druid-basic-security</module>
          <module>extensions-core/google-extensions</module>

druid/stackable/patches/26.0.0/patchable.toml

@@ -1,17 +1,17 @@
-From cb547abec8bb002984bcb598c75f5031ea9513e1 Mon Sep 17 00:00:00 2001
+From b449a870c7cf546117aba0a64c1b1487e036ab14 Mon Sep 17 00:00:00 2001
 From: Lars Francke <[email protected]>
-Date: Wed, 10 Jul 2024 17:07:13 +0200
+Date: Mon, 17 Feb 2025 16:42:34 +0100
 Subject: Include Prometheus emitter in distribution
 
 ---
  distribution/pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 46 insertions(+)
 
 diff --git a/distribution/pom.xml b/distribution/pom.xml
-index a6e72cf2c2..3ab13d5d11 100644
+index 9c2cfc8753..08b4121287 100644
 --- a/distribution/pom.xml
 +++ b/distribution/pom.xml
-@@ -637,6 +637,52 @@
+@@ -464,6 +464,52 @@
                  </plugins>
              </build>
          </profile>

druid/stackable/patches/26.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch renamed to druid/stackable/patches/30.0.1/0001-Removes-all-traces-of-the-druid-ranger-extension.patch

@@ -1,20 +1,20 @@
-From 2722e90c01f02f804f1030f6aa91d07638e5e0a3 Mon Sep 17 00:00:00 2001
+From 087a8e2324d938871c012097446f106daba7d6a7 Mon Sep 17 00:00:00 2001
 From: Lars Francke <[email protected]>
-Date: Thu, 12 Dec 2024 17:59:17 +0100
+Date: Mon, 17 Feb 2025 16:42:34 +0100
 Subject: Stop building unused extensions.
 
 By default Druid builds all community extensions and then discards them
 while assembling the final distribution. This patch removes unused
 extensions from the build.
 ---
- pom.xml | 32 ++++----------------------------
- 1 file changed, 4 insertions(+), 28 deletions(-)
+ pom.xml | 32 +-------------------------------
+ 1 file changed, 1 insertion(+), 31 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index a33c6bd521..f5001910e1 100644
+index 08a3f24210..e8585349f4 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -188,34 +188,10 @@
+@@ -200,39 +200,9 @@
          <module>extensions-core/google-extensions</module>
          <module>extensions-core/druid-catalog</module>
          <module>extensions-core/testing-tools</module>
@@ -41,31 +41,17 @@ index a33c6bd521..f5001910e1 100644
 -        <module>extensions-contrib/momentsketch</module>
 -        <module>extensions-contrib/moving-average-query</module>
 -        <module>extensions-contrib/tdigestsketch</module>
+-        <module>extensions-contrib/ddsketch</module>
 -        <module>extensions-contrib/influxdb-emitter</module>
 -        <module>extensions-contrib/gce-extensions</module>
 -        <module>extensions-contrib/aliyun-oss-extensions</module>
          <module>extensions-contrib/prometheus-emitter</module>
 -        <module>extensions-contrib/opentelemetry-emitter</module>
 -        <module>extensions-contrib/kubernetes-overlord-extensions</module>
-+
+-        <module>extensions-contrib/druid-iceberg-extensions</module>
+-        <module>extensions-contrib/druid-deltalake-extensions</module>
+-        <module>extensions-contrib/spectator-histogram</module>
+-        <module>extensions-contrib/rabbit-stream-indexing-service</module>
+ 
          <!-- distribution packaging -->
          <module>distribution</module>
-         <!-- Revised integration tests -->
-@@ -233,7 +209,7 @@
-                <enabled>false</enabled>
-             </snapshots>
-         </repository>
--        
-+
-         <!-- Only used by core, but moved to root for parallel build dependency resolution -->
-         <repository>
-             <id>sigar</id>
-@@ -243,7 +219,7 @@
-             </snapshots>
-         </repository>
-     </repositories>
--    
-+
-     <pluginRepositories>
-         <pluginRepository>
-             <id>${repoOrgId}</id>