Skip to content

Commit fa5ed44

Browse files
xeniapexeniape
authored
chore(druid): Update image for 25.11.0 (#1263)
* chore(druid): Update image for 25.11.0 * add changelog entry * add new line * add operator task * add operator task * adjust update template * adjust update template * adjust update template * revert merge change
1 parent 8366ad3 commit fa5ed44

14 files changed

+133
-146
lines changed

‎.github/ISSUE_TEMPLATE/update-product-druid.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ Add/Change/Remove anything that isn't applicable anymore
2727
2828
## Update tasks
2929

30-
- [ ] Release a new version of [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer)
30+
- [ ] Update the [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer/) with the new set of versions (profiles).
31+
- [ ] Release a new version of [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer), if compiling against the new Druid version(s) requires changes in the code.
3132
- [ ] Update `boil-config.toml` to reflect the agreed upon versions in the spreadsheet (including the removal of old versions).
32-
- [ ] Update the [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer/) with the new set of versions.
33-
- [ ] Upload new version (see `druid/upload_new_druid_version.sh`).
34-
- [ ] Create a file: `druid/stackable/patches/x.y.z/.gitkeep`, add patches if applicable.
35-
- [ ] Delete old patch directories.
3633
- [ ] Update `boil-config.toml` to the latest supported version of JVM (base and devel).
34+
- [ ] Initialize new product versions with patchable and add patches if applicable.
35+
- [ ] Delete old patch directories.
36+
- [ ] Check the corresponding operator (getting_started / kuttl / supported-versions) for usage of the versions.
3737
- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below.
3838
- [ ] Ensure prerequisites are up to date (required-external-components.adoc).
3939
- [ ] Update the version in demos. Add the PR(s) to the list below.

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file.
1515
- stackable-base: Add cert-tools ([#1247]).
1616
- kafka: Add jackson xml dataformat for Kafka 4.0.0 ([#1262]).
1717
- kafka: Add version `4.1.0` ([#1277]).
18+
- druid: Add `34.0.0` ([#1263]).
1819

1920
### Changed
2021

@@ -25,11 +26,13 @@ All notable changes to this project will be documented in this file.
2526
- stackable-devel: Bump ubi9 base image and update cargo-auditable to `0.7.0` ([#1253]).
2627
- vector: Bump to `0.49.0` ([#1258]).
2728
- airflow: Bump uvicorn dependency to `0.37.0` ([#1264]).
29+
- druid: Deprecate `33.0.0` ([#1263]).
2830

2931
### Removed
3032

3133
- opensearch: Stop applying formatting plugin ([#1230]).
3234
- kafka: Remove version `4.0.0` ([#1277]).
35+
- druid: Remove `31.0.1` ([#1263]).
3336

3437
[#1207]: https://github.com/stackabletech/docker-images/pull/1207
3538
[#1215]: https://github.com/stackabletech/docker-images/pull/1215
@@ -46,6 +49,7 @@ All notable changes to this project will be documented in this file.
4649
[#1262]: https://github.com/stackabletech/docker-images/pull/1262
4750
[#1264]: https://github.com/stackabletech/docker-images/pull/1264
4851
[#1277]: https://github.com/stackabletech/docker-images/pull/1277
52+
[#1263]: https://github.com/stackabletech/docker-images/pull/1263
4953

5054
## [25.7.0] - 2025-07-23
5155

‎druid/boil-config.toml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ java-devel = "17"
77
[versions."30.0.1".build-arguments]
88
authorizer-version = "0.7.0"
99

10-
[versions."31.0.1".local-images]
11-
# https://druid.apache.org/docs/31.0.1/operations/java/
10+
[versions."33.0.0".local-images]
11+
# https://druid.apache.org/docs/33.0.0/operations/java/
1212
java-base = "17"
1313
java-devel = "17"
1414
"hadoop/hadoop" = "3.3.6"
1515

16-
[versions."31.0.1".build-arguments]
16+
[versions."33.0.0".build-arguments]
1717
authorizer-version = "0.7.0"
1818

19-
[versions."33.0.0".local-images]
20-
# https://druid.apache.org/docs/33.0.0/operations/java/
19+
[versions."34.0.0".local-images]
20+
# https://druid.apache.org/docs/34.0.0/operations/java/
2121
java-base = "17"
2222
java-devel = "17"
23-
"hadoop/hadoop" = "3.3.6"
23+
"hadoop/hadoop" = "3.4.1"
2424

25-
[versions."33.0.0".build-arguments]
25+
[versions."34.0.0".build-arguments]
2626
authorizer-version = "0.7.0"

‎druid/stackable/patches/31.0.1/0001-Removes-all-traces-of-the-druid-ranger-extension.patch‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎druid/stackable/patches/34.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
From 515da2a96db1835133e2b367d4c006ce4fcf8a3a Mon Sep 17 00:00:00 2001
2+
From: xeniape <[email protected]>
3+
Date: Mon, 22 Sep 2025 14:20:53 +0200
4+
Subject: Removes all traces of the druid ranger extension
5+
6+
---
7+
distribution/pom.xml | 2 --
8+
pom.xml | 1 -
9+
2 files changed, 3 deletions(-)
10+
11+
diff --git a/distribution/pom.xml b/distribution/pom.xml
12+
index f7e9766494..7c2573fbd4 100644
13+
--- a/distribution/pom.xml
14+
+++ b/distribution/pom.xml
15+
@@ -460,8 +460,6 @@
16+
<argument>org.apache.druid.extensions.contrib:druid-rabbit-indexing-service</argument>
17+
<argument>-c</argument>
18+
<argument>org.apache.druid.extensions.contrib:grpc-query</argument>
19+
- <argument>-c</argument>
20+
- <argument>org.apache.druid.extensions.contrib:druid-ranger-security</argument>
21+
</arguments>
22+
</configuration>
23+
</execution>
24+
diff --git a/pom.xml b/pom.xml
25+
index 35ebdfdc34..829ddbd9e7 100644
26+
--- a/pom.xml
27+
+++ b/pom.xml
28+
@@ -260,7 +260,6 @@
29+
<module>extensions-contrib/druid-deltalake-extensions</module>
30+
<module>extensions-contrib/spectator-histogram</module>
31+
<module>extensions-contrib/rabbit-stream-indexing-service</module>
32+
- <module>extensions-contrib/druid-ranger-security</module>
33+
<!-- distribution packaging -->
34+
<module>distribution</module>
35+
<!-- Revised integration tests -->

‎druid/stackable/patches/31.0.1/0002-Include-Prometheus-emitter-in-distribution.patch‎ renamed to ‎druid/stackable/patches/34.0.0/0002-Include-Prometheus-emitter-in-distribution.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From 484bd7f13890823fdfdcbec5bd21b046ac885015 Mon Sep 17 00:00:00 2001
2-
From: Lars Francke <[email protected]>
3-
Date: Mon, 17 Feb 2025 16:42:34 +0100
1+
From c836d04ca08c6f341817096dcca7d8231c25ed66 Mon Sep 17 00:00:00 2001
2+
From: xeniape <[email protected]>
3+
Date: Mon, 22 Sep 2025 14:23:11 +0200
44
Subject: Include Prometheus emitter in distribution
55

66
---
77
distribution/pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++
88
1 file changed, 46 insertions(+)
99

1010
diff --git a/distribution/pom.xml b/distribution/pom.xml
11-
index 1a4f7df716..a28e34bb6a 100644
11+
index 7c2573fbd4..21954e8fb4 100644
1212
--- a/distribution/pom.xml
1313
+++ b/distribution/pom.xml
14-
@@ -464,6 +464,52 @@
14+
@@ -468,6 +468,52 @@
1515
</plugins>
1616
</build>
1717
</profile>

‎druid/stackable/patches/31.0.1/0003-Stop-building-unused-extensions.patch‎ renamed to ‎druid/stackable/patches/34.0.0/0003-Stop-building-unused-extensions.patch‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
1-
From 540182e6a1169103cb77ff37d963186f23204800 Mon Sep 17 00:00:00 2001
2-
From: Lars Francke <[email protected]>
3-
Date: Mon, 17 Feb 2025 16:42:34 +0100
1+
From 8a1e8f9c4eaa419bb59825e645cbacd0b4ec7d34 Mon Sep 17 00:00:00 2001
2+
From: xeniape <[email protected]>
3+
Date: Tue, 23 Sep 2025 09:31:00 +0200
44
Subject: Stop building unused extensions.
55

66
By default Druid builds all community extensions and then discards them
77
while assembling the final distribution. This patch removes unused
88
extensions from the build.
99
---
10-
pom.xml | 32 +-------------------------------
11-
1 file changed, 1 insertion(+), 31 deletions(-)
10+
pom.xml | 29 -----------------------------
11+
1 file changed, 29 deletions(-)
1212

1313
diff --git a/pom.xml b/pom.xml
14-
index 807f9f11df..e9e19f7920 100644
14+
index 829ddbd9e7..369550e166 100644
1515
--- a/pom.xml
1616
+++ b/pom.xml
17-
@@ -200,39 +200,9 @@
18-
<module>extensions-core/google-extensions</module>
19-
<module>extensions-core/druid-catalog</module>
17+
@@ -229,37 +229,8 @@
2018
<module>extensions-core/testing-tools</module>
21-
+
2219
<!-- Community extensions -->
23-
- <module>extensions-contrib/compressed-bigdecimal</module>
20+
<module>extensions-contrib/compressed-bigdecimal</module>
2421
- <module>extensions-contrib/influx-extensions</module>
2522
- <module>extensions-contrib/cassandra-storage</module>
2623
- <module>extensions-contrib/dropwizard-emitter</module>
@@ -33,7 +30,7 @@ index 807f9f11df..e9e19f7920 100644
3330
- <module>extensions-contrib/thrift-extensions</module>
3431
- <module>extensions-contrib/ambari-metrics-emitter</module>
3532
- <module>extensions-contrib/sqlserver-metadata-storage</module>
36-
- <module>extensions-contrib/kafka-emitter</module>
33+
<module>extensions-contrib/kafka-emitter</module>
3734
- <module>extensions-contrib/redis-cache</module>
3835
- <module>extensions-contrib/opentsdb-emitter</module>
3936
- <module>extensions-contrib/materialized-view-maintenance</module>
@@ -47,11 +44,11 @@ index 807f9f11df..e9e19f7920 100644
4744
- <module>extensions-contrib/aliyun-oss-extensions</module>
4845
<module>extensions-contrib/prometheus-emitter</module>
4946
- <module>extensions-contrib/opentelemetry-emitter</module>
50-
- <module>extensions-contrib/kubernetes-overlord-extensions</module>
47+
- <module>extensions-contrib/grpc-query</module>
5148
- <module>extensions-contrib/druid-iceberg-extensions</module>
5249
- <module>extensions-contrib/druid-deltalake-extensions</module>
5350
- <module>extensions-contrib/spectator-histogram</module>
5451
- <module>extensions-contrib/rabbit-stream-indexing-service</module>
55-
5652
<!-- distribution packaging -->
5753
<module>distribution</module>
54+
<!-- Revised integration tests -->

‎druid/stackable/patches/31.0.1/0004-Updates-all-dependencies-that-have-a-new-patch-relea.patch‎ renamed to ‎druid/stackable/patches/34.0.0/0004-Updates-all-dependencies-that-have-a-new-patch-relea.patch‎

Lines changed: 39 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
From 14918ed4cad073b1e62ba26111352dafd2da3ae0 Mon Sep 17 00:00:00 2001
2-
From: Lars Francke <[email protected]>
3-
Date: Mon, 17 Feb 2025 16:42:49 +0100
1+
From 90757e20d151e2744f5206df1f6b9fdc1992d78a Mon Sep 17 00:00:00 2001
2+
From: xeniape <[email protected]>
3+
Date: Tue, 23 Sep 2025 09:42:23 +0200
44
Subject: Updates all dependencies that have a new patch release available.
55

66
---
77
extensions-core/druid-pac4j/pom.xml | 2 +-
88
extensions-core/kubernetes-extensions/pom.xml | 2 +-
99
extensions-core/orc-extensions/pom.xml | 2 +-
10-
extensions-core/parquet-extensions/pom.xml | 2 +-
11-
pom.xml | 31 ++++++++++---------
10+
pom.xml | 24 ++++++++++++-------
1211
processing/pom.xml | 2 +-
13-
6 files changed, 22 insertions(+), 19 deletions(-)
12+
5 files changed, 19 insertions(+), 13 deletions(-)
1413

1514
diff --git a/extensions-core/druid-pac4j/pom.xml b/extensions-core/druid-pac4j/pom.xml
16-
index 3693d28d67..8be5e4c355 100644
15+
index 8e742e5f17..f5836cb8a4 100644
1716
--- a/extensions-core/druid-pac4j/pom.xml
1817
+++ b/extensions-core/druid-pac4j/pom.xml
1918
@@ -34,7 +34,7 @@
@@ -26,7 +25,7 @@ index 3693d28d67..8be5e4c355 100644
2625
<!-- 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-->
2726
<nimbus.lang.tag.version>1.7</nimbus.lang.tag.version>
2827
diff --git a/extensions-core/kubernetes-extensions/pom.xml b/extensions-core/kubernetes-extensions/pom.xml
29-
index 1e513ec8eb..7f43fdd108 100644
28+
index 9e9ddfd458..1ef515a68f 100644
3029
--- a/extensions-core/kubernetes-extensions/pom.xml
3130
+++ b/extensions-core/kubernetes-extensions/pom.xml
3231
@@ -34,7 +34,7 @@
@@ -39,7 +38,7 @@ index 1e513ec8eb..7f43fdd108 100644
3938

4039

4140
diff --git a/extensions-core/orc-extensions/pom.xml b/extensions-core/orc-extensions/pom.xml
42-
index 1b6a394728..bb4a9be716 100644
41+
index 656f34134f..376337f009 100644
4342
--- a/extensions-core/orc-extensions/pom.xml
4443
+++ b/extensions-core/orc-extensions/pom.xml
4544
@@ -31,7 +31,7 @@
@@ -51,93 +50,80 @@ index 1b6a394728..bb4a9be716 100644
5150
</properties>
5251
<dependencies>
5352
<dependency>
54-
diff --git a/extensions-core/parquet-extensions/pom.xml b/extensions-core/parquet-extensions/pom.xml
55-
index 0d18d9162d..a8f9e7d52e 100644
56-
--- a/extensions-core/parquet-extensions/pom.xml
57-
+++ b/extensions-core/parquet-extensions/pom.xml
58-
@@ -201,7 +201,7 @@
59-
</dependency>
60-
</dependencies>
61-
<properties>
62-
- <parquet.version>1.13.0</parquet.version>
63-
+ <parquet.version>1.13.1</parquet.version>
64-
</properties>
65-
</profile>
66-
</profiles>
6753
diff --git a/pom.xml b/pom.xml
68-
index e9e19f7920..4408e55b9c 100644
54+
index 369550e166..ae6f8f9c15 100644
6955
--- a/pom.xml
7056
+++ b/pom.xml
71-
@@ -74,7 +74,7 @@
72-
<maven.compiler.target>1.8</maven.compiler.target>
73-
<java.version>8</java.version>
57+
@@ -73,7 +73,7 @@
58+
<java.version>11</java.version>
59+
<maven.compiler.release>${java.version}</maven.compiler.release>
7460
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
7561
- <aether.version>0.9.0.M2</aether.version>
7662
+ <aether.version>0.9.1.v20140329</aether.version>
77-
<apache.curator.version>5.5.0</apache.curator.version>
78-
<apache.kafka.version>3.9.0</apache.kafka.version>
63+
<apache.curator.version>5.8.0</apache.curator.version>
64+
<apache.kafka.version>3.9.1</apache.kafka.version>
7965
<!-- when updating apache ranger, verify the usage of aws-bundle-sdk vs aws-logs-sdk
80-
@@ -90,24 +90,27 @@
81-
<calcite.version>1.37.0</calcite.version>
82-
<confluent.version>6.2.12</confluent.version>
66+
@@ -90,11 +90,14 @@
67+
<confluent.version>6.2.15</confluent.version>
68+
<cronutils.version>9.2.0</cronutils.version>
8369
<datasketches.version>4.2.0</datasketches.version>
8470
- <datasketches.memory.version>2.2.0</datasketches.memory.version>
8571
+ <datasketches.memory.version>2.2.1</datasketches.memory.version>
8672
<derby.version>10.14.2.0</derby.version>
8773
- <dropwizard.metrics.version>4.2.22</dropwizard.metrics.version>
8874
+ <dropwizard.metrics.version>4.2.30</dropwizard.metrics.version>
89-
<errorprone.version>2.20.0</errorprone.version>
75+
<errorprone.version>2.35.1</errorprone.version>
9076
- <fastutil.version>8.5.4</fastutil.version>
9177
+ <!-- An additional null check was introduced in fastutils 8.5.7 that breaks data ingestion tasks:
9278
+ https://github.com/stackabletech/druid-operator/issues/595
9379
+ https://github.com/vigna/fastutil/commit/598a4fd064e193be69ea324aa86947477c82ede8 -->
9480
+ <fastutil.version>8.5.6</fastutil.version>
95-
<guava.version>32.0.1-jre</guava.version>
96-
<guice.version>4.1.0</guice.version>
81+
<guava.version>32.1.3-jre</guava.version>
82+
<guice.version>5.1.0</guice.version>
9783
<hamcrest.version>1.3</hamcrest.version>
98-
- <jetty.version>9.4.56.v20240826</jetty.version>
99-
+ <jetty.version>9.4.57.v20241219</jetty.version>
84+
@@ -102,13 +105,13 @@
10085
<jersey.version>1.19.4</jersey.version>
101-
- <jackson.version>2.12.7.20221012</jackson.version>
86+
<jackson.core.version>2.18.4.1</jackson.core.version>
87+
<jackson.version>2.18.4</jackson.version>
10288
- <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
103-
+ <jackson.version>2.12.7.20240502</jackson.version>
10489
+ <codehaus.jackson.version>1.9.14-MULE-002</codehaus.jackson.version>
10590
<log4j.version>2.22.1</log4j.version>
10691
<mysql.version>8.2.0</mysql.version>
10792
<mariadb.version>2.7.3</mariadb.version>
10893
<netty3.version>3.10.6.Final</netty3.version>
109-
- <netty4.version>4.1.108.Final</netty4.version>
94+
<netty4.version>4.1.122.Final</netty4.version>
11095
- <postgresql.version>42.7.2</postgresql.version>
111-
+ <netty4.version>4.1.117.Final</netty4.version>
11296
+ <postgresql.version>42.7.5</postgresql.version>
11397
<protobuf.version>3.25.5</protobuf.version>
11498
<resilience4j.version>1.3.1</resilience4j.version>
115-
<slf4j.version>1.7.36</slf4j.version>
116-
@@ -118,17 +121,17 @@
117-
<!-- mockito-inline artifact was removed in mockito 5.3 (mockito 5.x is required for Java >17),
118-
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) -->
119-
<mockito.inline.artifact>core</mockito.inline.artifact>
120-
- <aws.sdk.version>1.12.638</aws.sdk.version>
99+
<slf4j.version>2.0.16</slf4j.version>
100+
@@ -117,18 +120,21 @@
101+
<hadoop.compile.version>3.3.6</hadoop.compile.version>
102+
<graaljs.version>22.3.5</graaljs.version>
103+
<mockito.version>5.14.2</mockito.version>
104+
+ <!-- mockito-inline artifact was removed in mockito 5.3 (mockito 5.x is required for Java >17),
105+
+ 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) -->
106+
+ <mockito.inline.artifact>core</mockito.inline.artifact>
107+
<aws.sdk.version>1.12.784</aws.sdk.version>
121108
- <caffeine.version>2.8.0</caffeine.version>
122-
- <jacoco.version>0.8.7</jacoco.version>
123-
+ <aws.sdk.version>1.12.780</aws.sdk.version>
124109
+ <caffeine.version>2.8.8</caffeine.version>
125-
+ <jacoco.version>0.8.12</jacoco.version>
110+
<jacoco.version>0.8.12</jacoco.version>
111+
<testcontainers.version>1.21.3</testcontainers.version>
126112
<hibernate-validator.version>6.2.5.Final</hibernate-validator.version>
127113
- <httpclient.version>4.5.13</httpclient.version>
128114
+ <httpclient.version>4.5.14</httpclient.version>
129115
<!-- When upgrading ZK, edit docs and integration tests as well (integration-tests/docker-base/setup.sh) -->
130116
<zookeeper.version>3.8.4</zookeeper.version>
131-
<checkerframework.version>2.5.7</checkerframework.version>
117+
<checkerframework.version>3.48.1</checkerframework.version>
132118
<com.google.apis.client.version>2.2.0</com.google.apis.client.version>
133119
<com.google.http.client.apis.version>1.42.3</com.google.http.client.apis.version>
134120
- <com.google.apis.compute.version>v1-rev20230606-2.0.0</com.google.apis.compute.version>
135121
+ <com.google.apis.compute.version>v1-rev20250107-2.0.0</com.google.apis.compute.version>
136122
<com.google.cloud.storage.version>2.29.1</com.google.cloud.storage.version>
137-
<jdk.strong.encapsulation.argLine><!-- empty placeholder --></jdk.strong.encapsulation.argLine>
138-
<jdk.security.manager.allow.argLine><!-- empty placeholder --></jdk.security.manager.allow.argLine>
123+
<jdk.strong.encapsulation.argLine>
124+
<!-- Strong encapsulation parameters -->
139125
diff --git a/processing/pom.xml b/processing/pom.xml
140-
index d5418dce93..716c1299f4 100644
126+
index 05232d48c1..a10f42d189 100644
141127
--- a/processing/pom.xml
142128
+++ b/processing/pom.xml
143129
@@ -36,7 +36,7 @@

0 commit comments

Comments
 (0)