drop druid 26 / add 30.0.1

CHANGELOG.md

@@ -14,7 +14,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 31.0.1 ([#984])
+- 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 +36,6 @@ 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
@@ -48,6 +47,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
 
@@ -78,7 +78,6 @@ All notable changes to this project will be documented in this file.
 [#997]: https://github.com/stackabletech/docker-images/pull/997
 [#999]: https://github.com/stackabletech/docker-images/pull/999
 [#1000]: https://github.com/stackabletech/docker-images/pull/1000
-[#1003]: https://github.com/stackabletech/docker-images/pull/1003
 [#1006]: https://github.com/stackabletech/docker-images/pull/1006
 [#1007]: https://github.com/stackabletech/docker-images/pull/1007
 

druid/stackable/patches/26.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch → druid/stackable/patches/30.0.1/01-remove-ranger-security.patch

@@ -1,18 +1,16 @@
-From a8bec93ee6d0a4364676333168229aa0ec56657e Mon Sep 17 00:00:00 2001
+Removes all traces of the druid ranger extension
+
 From: Lars Francke <[email protected]>
-Date: Thu, 12 Dec 2024 17:59:17 +0100
-Subject: Removes all traces of the druid ranger extension
+
 
 ---
- distribution/pom.xml | 4 ----
- pom.xml              | 1 -
- 2 files changed, 5 deletions(-)
+ 0 files changed
 
 diff --git a/distribution/pom.xml b/distribution/pom.xml
-index eec26171af..a6e72cf2c2 100644
+index 0f17a8c877..d7cd645767 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 +19,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 cfca79dc6e..2acb812cbe 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -186,7 +186,6 @@
+@@ -199,7 +199,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/0002-Include-Prometheus-emitter-in-distribution.patch → druid/stackable/patches/30.0.1/02-prometheus-emitter-from-source.patch

@@ -1,17 +1,16 @@
-From c19288cd84492d76f924152f2d4f0d0fc0499ed6 Mon Sep 17 00:00:00 2001
+Include Prometheus emitter in distribution
+
 From: Lars Francke <[email protected]>
-Date: Thu, 12 Dec 2024 17:59:17 +0100
-Subject: Include Prometheus emitter in distribution
+
 
 ---
- distribution/pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 46 insertions(+)
+ 0 files changed
 
 diff --git a/distribution/pom.xml b/distribution/pom.xml
-index a6e72cf2c2..3ab13d5d11 100644
+index d7cd645767..eda1ddcfab 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/0003-Stop-building-unused-extensions.patch → druid/stackable/patches/30.0.1/03-stop-building-unused-extensions.patch

@@ -1,20 +1,18 @@
-From 85cacbcc47c88a56acd60d91fbf0412040523c8d Mon Sep 17 00:00:00 2001
+Stop building unused extensions.
+
 From: Lars Francke <[email protected]>
-Date: Thu, 12 Dec 2024 17:59:17 +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(-)
+ 0 files changed
 
 diff --git a/pom.xml b/pom.xml
-index a33c6bd521..f5001910e1 100644
+index 2acb812cbe..38e0ddc61a 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -188,34 +188,10 @@
+@@ -201,39 +201,9 @@
          <module>extensions-core/google-extensions</module>
          <module>extensions-core/druid-catalog</module>
          <module>extensions-core/testing-tools</module>
@@ -41,31 +39,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>