chore(druid): Add 35.0.1, remove 33.0.0

CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 ### Added
 
 - airflow: Add 3.1.5 ([#1405]).
+- druid: Add 35.0.1 ([#1406]).
 - superset: Add 6.0.0 ([#1337], [#1393]).
 - opa: Add 1.12.2 ([#1396]).
 - hive: Build [hive-metastore-opa-authorizer](https://github.com/boschglobal/hive-metastore-opa-authorizer) from source and add to image ([#1340]).
@@ -31,6 +32,7 @@ All notable changes to this project will be documented in this file.
 ### Removed
 
 - airflow: Remove 2.10.5 and 3.0.1 ([#1405]).
+- druid: Remove 33.0.0 ([#1406]).
 - opensearch: Remove the `performance-analyzer` plugin from the OpenSearch image ([#1357]).
 - superset: Remove 4.0.2 and 4.1.2 ([#1394]).
 - kafka: Remove `3.7.2` and `4.1.0` ([#1395]).
@@ -65,6 +67,7 @@ All notable changes to this project will be documented in this file.
 [#1396]: https://github.com/stackabletech/docker-images/pull/1396
 [#1401]: https://github.com/stackabletech/docker-images/pull/1401
 [#1405]: https://github.com/stackabletech/docker-images/pull/1405
+[#1406]: https://github.com/stackabletech/docker-images/pull/1406
 
 ## [25.11.0] - 2025-11-07
 

druid/boil-config.toml

@@ -1,3 +1,4 @@
+# LTS since 24.11
 [versions."30.0.1".local-images]
 # https://druid.apache.org/docs/30.0.1/operations/java/
 java-base = "17"
@@ -7,20 +8,22 @@ java-devel = "17"
 [versions."30.0.1".build-arguments]
 authorizer-version = "0.7.0"
 
-[versions."33.0.0".local-images]
-# https://druid.apache.org/docs/33.0.0/operations/java/
-java-base = "17"
-java-devel = "17"
-"hadoop/hadoop" = "3.3.6"
-
-[versions."33.0.0".build-arguments]
-authorizer-version = "0.7.0"
-
 [versions."34.0.0".local-images]
 # https://druid.apache.org/docs/34.0.0/operations/java/
 java-base = "17"
 java-devel = "17"
 "hadoop/hadoop" = "3.4.1"
 
+# Deprecated since 26.3
 [versions."34.0.0".build-arguments]
 authorizer-version = "0.7.0"
+
+# Supported
+[versions."35.0.1".local-images]
+# https://druid.apache.org/docs/35.0.1/operations/java/
+java-base = "21"
+java-devel = "21"
+"hadoop/hadoop" = "3.4.2"
+
+[versions."35.0.1".build-arguments]
+authorizer-version = "0.7.0"

druid/stackable/patches/33.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch → druid/stackable/patches/35.0.1/0001-Removes-all-traces-of-the-druid-ranger-extension.patch

@@ -1,6 +1,6 @@
-From 0517d9fb940879ced639eb0d717ba4b5f67d9670 Mon Sep 17 00:00:00 2001
-From: Lars Francke <git@lars-francke.de>
-Date: Wed, 10 Jul 2024 17:07:13 +0200
+From c448a03652740ed95f7cfadd48cd2bbad1b37226 Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Mon, 22 Sep 2025 14:20:53 +0200
 Subject: Removes all traces of the druid ranger extension
 
 ---
@@ -9,23 +9,23 @@ Subject: Removes all traces of the druid ranger extension
  2 files changed, 3 deletions(-)
 
 diff --git a/distribution/pom.xml b/distribution/pom.xml
-index 8ee50f9029..cb54001d20 100644
+index 720eef1ed3..d02451a7bd 100644
 --- a/distribution/pom.xml
 +++ b/distribution/pom.xml
-@@ -458,8 +458,6 @@
-                                         <argument>org.apache.druid.extensions.contrib:druid-rabbit-indexing-service</argument>
+@@ -459,8 +459,6 @@
                                          <argument>-c</argument>
                                          <argument>org.apache.druid.extensions.contrib:grpc-query</argument>
--                                        <argument>-c</argument>
+                                         <argument>-c</argument>
 -                                        <argument>org.apache.druid.extensions.contrib:druid-ranger-security</argument>
+-                                        <argument>-c</argument>
+                                         <argument>org.apache.druid.extensions.contrib:druid-exact-count-bitmap</argument>
                                      </arguments>
                                  </configuration>
-                             </execution>
 diff --git a/pom.xml b/pom.xml
-index 1f7d6a69df..09daa8b2e9 100644
+index cf1cbcfda3..29f0c12301 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -258,7 +258,6 @@
+@@ -262,7 +262,6 @@
          <module>extensions-contrib/druid-deltalake-extensions</module>
          <module>extensions-contrib/spectator-histogram</module>
          <module>extensions-contrib/rabbit-stream-indexing-service</module>

druid/stackable/patches/33.0.0/0002-Include-Prometheus-emitter-in-distribution.patch → druid/stackable/patches/35.0.1/0002-Include-Prometheus-emitter-in-distribution.patch

@@ -1,17 +1,17 @@
-From 7cd9440c7f484db79ca4a7b107fc0404dc9421a0 Mon Sep 17 00:00:00 2001
-From: Lars Francke <git@lars-francke.de>
-Date: Mon, 17 Feb 2025 16:42:34 +0100
+From 81c4a1186bace2d8fafe4bc74d02961d5c2804bb Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Mon, 22 Sep 2025 14:23:11 +0200
 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 cb54001d20..c8b7e13054 100644
+index d02451a7bd..feb7b0b7e5 100644
 --- a/distribution/pom.xml
 +++ b/distribution/pom.xml
-@@ -466,6 +466,52 @@
+@@ -468,6 +468,52 @@
                  </plugins>
              </build>
          </profile>

druid/stackable/patches/33.0.0/0003-Stop-building-unused-extensions.patch → druid/stackable/patches/35.0.1/0003-Stop-building-unused-extensions.patch

@@ -1,37 +1,37 @@
-From 2259629e248db402a660b42d7eca75f17e164b7f Mon Sep 17 00:00:00 2001
-From: Lars Francke <git@lars-francke.de>
-Date: Mon, 17 Feb 2025 16:42:34 +0100
+From 587430dc804bf991e1175cbff25288b18f64aa1a Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Tue, 23 Sep 2025 09:31:00 +0200
 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 | 31 -------------------------------
- 1 file changed, 31 deletions(-)
+ pom.xml | 30 ------------------------------
+ 1 file changed, 30 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 09daa8b2e9..df781fac63 100644
+index 29f0c12301..b291470096 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -226,38 +226,7 @@
-         <module>extensions-core/druid-catalog</module>
-         <module>extensions-core/testing-tools</module>
+@@ -230,38 +230,8 @@
+         <module>extensions-core/druid-testcontainers</module>
          <!-- Community extensions -->
--        <module>extensions-contrib/compressed-bigdecimal</module>
+         <module>extensions-contrib/compressed-bigdecimal</module>
 -        <module>extensions-contrib/influx-extensions</module>
 -        <module>extensions-contrib/cassandra-storage</module>
 -        <module>extensions-contrib/dropwizard-emitter</module>
 -        <module>extensions-contrib/cloudfiles-extensions</module>
 -        <module>extensions-contrib/graphite-emitter</module>
 -        <module>extensions-contrib/distinctcount</module>
+-        <module>extensions-contrib/druid-exact-count-bitmap</module>
 -        <module>extensions-contrib/statsd-emitter</module>
 -        <module>extensions-contrib/time-min-max</module>
 -        <module>extensions-contrib/virtual-columns</module>
 -        <module>extensions-contrib/thrift-extensions</module>
 -        <module>extensions-contrib/ambari-metrics-emitter</module>
 -        <module>extensions-contrib/sqlserver-metadata-storage</module>
--        <module>extensions-contrib/kafka-emitter</module>
+         <module>extensions-contrib/kafka-emitter</module>
 -        <module>extensions-contrib/redis-cache</module>
 -        <module>extensions-contrib/opentsdb-emitter</module>
 -        <module>extensions-contrib/materialized-view-maintenance</module>

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

@@ -1,31 +1,31 @@
-From 14b8c8cb1ce5e458ca8d1ff3cafa8adfa86c6c91 Mon Sep 17 00:00:00 2001
-From: Lars Francke <git@lars-francke.de>
-Date: Mon, 17 Feb 2025 16:42:49 +0100
+From d509fa398601c43409647dc0ece5e7d6923762de Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Tue, 23 Sep 2025 09:42:23 +0200
 Subject: Updates all dependencies that have a new patch release available.
 
 ---
  extensions-core/druid-pac4j/pom.xml           |  2 +-
  extensions-core/kubernetes-extensions/pom.xml |  2 +-
  extensions-core/orc-extensions/pom.xml        |  2 +-
- pom.xml                                       | 28 +++++++++++--------
+ pom.xml                                       | 29 ++++++++++++-------
  processing/pom.xml                            |  2 +-
- 5 files changed, 21 insertions(+), 15 deletions(-)
+ 5 files changed, 22 insertions(+), 15 deletions(-)
 
 diff --git a/extensions-core/druid-pac4j/pom.xml b/extensions-core/druid-pac4j/pom.xml
-index 7f20428b10..b11e324c6a 100644
+index d647d9b3f9..93c378eebe 100644
 --- a/extensions-core/druid-pac4j/pom.xml
 +++ b/extensions-core/druid-pac4j/pom.xml
 @@ -34,7 +34,7 @@
    </parent>
 
    <properties>
--    <pac4j.version>4.5.7</pac4j.version>
-+    <pac4j.version>4.5.8</pac4j.version>
+-    <pac4j.version>5.7.3</pac4j.version>
++    <pac4j.version>5.7.8</pac4j.version>
 
      <!-- Following must be updated along with any updates to pac4j version. One can find the compatible version of nimbus libraries in org.pac4j:pac4j-oidc dependencies-->
      <nimbus.lang.tag.version>1.7</nimbus.lang.tag.version>
 diff --git a/extensions-core/kubernetes-extensions/pom.xml b/extensions-core/kubernetes-extensions/pom.xml
-index a910172cae..549de276f7 100644
+index e7f5633f6e..1b587f825e 100644
 --- a/extensions-core/kubernetes-extensions/pom.xml
 +++ b/extensions-core/kubernetes-extensions/pom.xml
 @@ -34,7 +34,7 @@
@@ -38,7 +38,7 @@ index a910172cae..549de276f7 100644
 
 
 diff --git a/extensions-core/orc-extensions/pom.xml b/extensions-core/orc-extensions/pom.xml
-index c790639e41..9fb910a86f 100644
+index 5987006731..45bcca8927 100644
 --- a/extensions-core/orc-extensions/pom.xml
 +++ b/extensions-core/orc-extensions/pom.xml
 @@ -31,7 +31,7 @@
@@ -51,7 +51,7 @@ index c790639e41..9fb910a86f 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index df781fac63..7a7cbea9de 100644
+index b291470096..50584a1c42 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -73,7 +73,7 @@
@@ -60,11 +60,11 @@ index df781fac63..7a7cbea9de 100644
          <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
 -        <aether.version>0.9.0.M2</aether.version>
 +        <aether.version>0.9.1.v20140329</aether.version>
-         <apache.curator.version>5.5.0</apache.curator.version>
-         <apache.kafka.version>3.9.0</apache.kafka.version>
+         <apache.curator.version>5.8.0</apache.curator.version>
+         <apache.kafka.version>3.9.1</apache.kafka.version>
          <!-- when updating apache ranger, verify the usage of aws-bundle-sdk vs aws-logs-sdk
-@@ -90,24 +90,27 @@
-         <confluent.version>6.2.12</confluent.version>
+@@ -90,25 +90,29 @@
+         <confluent.version>6.2.15</confluent.version>
          <cronutils.version>9.2.0</cronutils.version>
          <datasketches.version>4.2.0</datasketches.version>
 -        <datasketches.memory.version>2.2.0</datasketches.memory.version>
@@ -73,42 +73,45 @@ index df781fac63..7a7cbea9de 100644
 -        <dropwizard.metrics.version>4.2.22</dropwizard.metrics.version>
 +        <dropwizard.metrics.version>4.2.30</dropwizard.metrics.version>
          <errorprone.version>2.35.1</errorprone.version>
+         <fabric8.version>7.4.0</fabric8.version>
 -        <fastutil.version>8.5.4</fastutil.version>
 +        <!-- An additional null check was introduced in fastutils 8.5.7 that breaks data ingestion tasks:
 +             https://github.com/stackabletech/druid-operator/issues/595
 +             https://github.com/vigna/fastutil/commit/598a4fd064e193be69ea324aa86947477c82ede8 -->
 +        <fastutil.version>8.5.6</fastutil.version>
-         <guava.version>32.0.1-jre</guava.version>
+         <guava.version>32.1.3-jre</guava.version>
          <guice.version>5.1.0</guice.version>
          <hamcrest.version>1.3</hamcrest.version>
-         <jetty.version>9.4.57.v20241219</jetty.version>
+         <jetty.version>12.0.25</jetty.version>
          <jersey.version>1.19.4</jersey.version>
--        <jackson.version>2.12.7.20221012</jackson.version>
+-        <jackson.version>2.19.2</jackson.version>
 -        <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
-+        <jackson.version>2.12.7.20240502</jackson.version>
++        <jackson.core.version>2.19.4</jackson.core.version>
++        <jackson.version>2.19.4</jackson.version>
 +        <codehaus.jackson.version>1.9.14-MULE-002</codehaus.jackson.version>
          <log4j.version>2.22.1</log4j.version>
          <mysql.version>8.2.0</mysql.version>
          <mariadb.version>2.7.3</mariadb.version>
          <netty3.version>3.10.6.Final</netty3.version>
-         <netty4.version>4.1.118.Final</netty4.version>
+-        <netty4.version>4.2.6.Final</netty4.version>
 -        <postgresql.version>42.7.2</postgresql.version>
-+        <postgresql.version>42.7.5</postgresql.version>
-         <protobuf.version>3.25.5</protobuf.version>
++        <netty4.version>4.2.9.Final</netty4.version>
++        <postgresql.version>42.7.9</postgresql.version>
+         <protobuf.version>3.25.8</protobuf.version>
          <resilience4j.version>1.3.1</resilience4j.version>
-         <slf4j.version>1.7.36</slf4j.version>
-@@ -116,17 +119,20 @@
+         <slf4j.version>2.0.16</slf4j.version>
+@@ -117,18 +121,21 @@
          <hadoop.compile.version>3.3.6</hadoop.compile.version>
          <graaljs.version>22.3.5</graaljs.version>
          <mockito.version>5.14.2</mockito.version>
--        <aws.sdk.version>1.12.638</aws.sdk.version>
--        <caffeine.version>2.8.0</caffeine.version>
 +        <!-- mockito-inline artifact was removed in mockito 5.3 (mockito 5.x is required for Java >17),
 +             however it is required in some cases when running against mockito 4.x (mockito 4.x is required for Java <11. We use the following property to pick the proper artifact based on Java version (see pre-java-11 profile) -->
 +        <mockito.inline.artifact>core</mockito.inline.artifact>
-+        <aws.sdk.version>1.12.780</aws.sdk.version>
+         <aws.sdk.version>1.12.784</aws.sdk.version>
+-        <caffeine.version>2.8.0</caffeine.version>
 +        <caffeine.version>2.8.8</caffeine.version>
          <jacoco.version>0.8.12</jacoco.version>
+         <testcontainers.version>1.21.3</testcontainers.version>
          <hibernate-validator.version>6.2.5.Final</hibernate-validator.version>
 -        <httpclient.version>4.5.13</httpclient.version>
 +        <httpclient.version>4.5.14</httpclient.version>
@@ -123,7 +126,7 @@ index df781fac63..7a7cbea9de 100644
          <jdk.strong.encapsulation.argLine>
              <!-- Strong encapsulation parameters -->
 diff --git a/processing/pom.xml b/processing/pom.xml
-index a43f1262d0..8cc22d5195 100644
+index ab1bf90064..7b6b682dfb 100644
 --- a/processing/pom.xml
 +++ b/processing/pom.xml
 @@ -36,7 +36,7 @@

druid/stackable/patches/33.0.0/0005-Include-jackson-dataformat-xml-dependency.patch → druid/stackable/patches/35.0.1/0005-Include-jackson-dataformat-xml-dependency.patch

@@ -1,6 +1,6 @@
-From 3df406a5c0d69a24d3ae8e4ef372fab058bf5279 Mon Sep 17 00:00:00 2001
-From: Lars Francke <git@lars-francke.de>
-Date: Mon, 17 Feb 2025 16:42:49 +0100
+From 76e1f86cdcf58fcfdbd17d601d5dd9bafe55c241 Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Tue, 23 Sep 2025 09:42:41 +0200
 Subject: Include jackson-dataformat-xml dependency.
 
 This allows us to use XmlLayout for Log4jV2.
@@ -12,7 +12,7 @@ build.
  1 file changed, 5 insertions(+)
 
 diff --git a/server/pom.xml b/server/pom.xml
-index 468a40d9f0..0ffcfd60b9 100644
+index dcaa891caa..583e187c37 100644
 --- a/server/pom.xml
 +++ b/server/pom.xml
 @@ -218,6 +218,11 @@

druid/stackable/patches/33.0.0/0006-Stop-building-the-tar.gz-distribution.patch → druid/stackable/patches/35.0.1/0006-Stop-building-the-tar.gz-distribution.patch

@@ -1,6 +1,6 @@
-From 88931513218f65a4f378fefb281cbf0dcc872563 Mon Sep 17 00:00:00 2001
-From: Lars Francke <git@lars-francke.de>
-Date: Mon, 17 Feb 2025 16:42:49 +0100
+From bf5cf4e75504c5276469354646fdece9e519f1f5 Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Tue, 23 Sep 2025 09:42:51 +0200
 Subject: Stop building the tar.gz distribution.
 
 All we do is build Druid tar and gzip it only to immediately uncompress it

druid/stackable/patches/33.0.0/0007-Update-CycloneDX-plugin.patch → druid/stackable/patches/35.0.1/0007-Update-CycloneDX-plugin.patch

@@ -1,17 +1,17 @@
-From 9c3a542018886a2330a7d54ee9bf96cdda6095ac Mon Sep 17 00:00:00 2001
-From: Lukas Voetmand <lukas.voetmand@stackable.tech>
-Date: Fri, 6 Sep 2024 17:53:52 +0200
+From 4e1e9e77c79c41cbd3a874e09cfbbf8a27025f86 Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Tue, 23 Sep 2025 09:43:11 +0200
 Subject: Update CycloneDX plugin
 
 ---
  pom.xml | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/pom.xml b/pom.xml
-index 7a7cbea9de..1687b906f7 100644
+index 50584a1c42..dd0151b9cc 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1776,7 +1776,11 @@
+@@ -1853,7 +1853,11 @@
              <plugin>
                  <groupId>org.cyclonedx</groupId>
                  <artifactId>cyclonedx-maven-plugin</artifactId>

druid/stackable/patches/33.0.0/0008-Fix-CVE-2024-36114.patch → druid/stackable/patches/35.0.1/0008-Fix-CVE-2024-36114.patch

@@ -1,6 +1,6 @@
-From a658272dda39b4bd26d55b70a01d67cd9db7bfcf Mon Sep 17 00:00:00 2001
-From: Malte Sander <malte.sander.it@gmail.com>
-Date: Thu, 12 Dec 2024 17:59:17 +0100
+From 01ddd388cd59ed76c041d6ab80b8f083180f10d1 Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Tue, 23 Sep 2025 09:43:28 +0200
 Subject: Fix CVE-2024-36114
 
 Fix CVE-2024-36114
@@ -27,10 +27,10 @@ known workarounds for this issue.
  1 file changed, 6 insertions(+)
 
 diff --git a/pom.xml b/pom.xml
-index 1687b906f7..7149b14cc0 100644
+index dd0151b9cc..d8774c490c 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -282,6 +282,12 @@
+@@ -287,6 +287,12 @@
      </pluginRepositories>
      <dependencyManagement>
          <dependencies>