Skip to content

Commit de2bb34

Browse files
authored
feat: Add Druid 37.0.0 (#1535)
* chore(druid) Remove 34.0.0 * feat(druid) Add 37.0.0 * chore: Update changelog * chore(druid): Add more patches * chore(druid/37.0.0): Combine two patches. Previously 0002 introduced --no-default-hadoop. The arg is not valid anymore, and was removed in a later patch 0011. Now it's all done in 0002.
1 parent a0af819 commit de2bb34

15 files changed

Lines changed: 264 additions & 188 deletions

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file.
1818
- zookeeper: Add `3.9.5` ([#1515]).
1919
- hadoop: Add `3.5.0` and `3.4.3` ([#1511]).
2020
- airflow: Add `3.2.1` ([#1519]).
21+
- druid: Add `37.0.0` ([#1535]).
2122

2223
### Changed
2324

@@ -45,6 +46,7 @@ All notable changes to this project will be documented in this file.
4546
- nifi: Remove `1.28.1`, deprecate `2.7.2` ([#1520]).
4647
- opa: Remove `1.8.0` ([#1509]).
4748
- spark-k8s: Remove `3.5.7` and `4.0.1` ([#1525]).
49+
- druid: Remove `34.0.0` ([#1535]).
4850

4951
[#1446]: https://github.com/stackabletech/docker-images/pull/1446
5052
[#1452]: https://github.com/stackabletech/docker-images/pull/1452
@@ -72,6 +74,7 @@ All notable changes to this project will be documented in this file.
7274
[#1524]: https://github.com/stackabletech/docker-images/pull/1524
7375
[#1525]: https://github.com/stackabletech/docker-images/pull/1525
7476
[#1533]: https://github.com/stackabletech/docker-images/pull/1533
77+
[#1535]: https://github.com/stackabletech/docker-images/pull/1535
7578

7679
## [26.3.0] - 2026-03-16
7780

druid/boil-config.toml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[metadata.registries]
22
"oci.stackable.tech" = { namespace = "sdp" }
33

4-
# LTS since 24.11
4+
# Deprecated since 26.7
55
[versions."30.0.1".local-images]
66
# https://druid.apache.org/docs/30.0.1/operations/java/
77
java-base = "17"
@@ -11,22 +11,24 @@ java-devel = "17"
1111
[versions."30.0.1".build-arguments]
1212
authorizer-version = "0.7.0"
1313

14-
[versions."34.0.0".local-images]
15-
# https://druid.apache.org/docs/34.0.0/operations/java/
16-
java-base = "17"
17-
java-devel = "17"
18-
"hadoop/hadoop" = "3.4.2" # TODO: Bump to 3.4.3
19-
20-
# Deprecated since 26.3
21-
[versions."34.0.0".build-arguments]
22-
authorizer-version = "0.7.0"
23-
24-
# Supported
14+
# Deprecated since 26.7
2515
[versions."35.0.1".local-images]
2616
# https://druid.apache.org/docs/35.0.1/operations/java/
2717
java-base = "21"
2818
java-devel = "21"
29-
"hadoop/hadoop" = "3.4.2" # TODO: Bump to 3.4.3
19+
"hadoop/hadoop" = "3.4.3"
3020

3121
[versions."35.0.1".build-arguments]
3222
authorizer-version = "0.7.0"
23+
24+
# LTS since 26.7
25+
[versions."37.0.0".local-images]
26+
# https://druid.apache.org/docs/37.0.0/operations/java/
27+
java-base = "21"
28+
java-devel = "21"
29+
"hadoop/hadoop" = "3.4.3"
30+
31+
[versions."37.0.0".build-arguments]
32+
# We don't need to bump this if no code changed in https://github.com/stackabletech/druid-opa-authorizer
33+
# But a PR still needs to be raised to add/remove versions and ensure it still builds.
34+
authorizer-version = "0.7.0"

druid/stackable/patches/34.0.0/0007-Update-CycloneDX-plugin.patch

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

druid/stackable/patches/34.0.0/0008-Fix-CVE-2024-36114.patch

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

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 515da2a96db1835133e2b367d4c006ce4fcf8a3a Mon Sep 17 00:00:00 2001
1+
From 319acbb818938c36b27f875e243c157dfc32fff4 Mon Sep 17 00:00:00 2001
22
From: xeniape <xenia.fischer@stackable.tech>
33
Date: Mon, 22 Sep 2025 14:20:53 +0200
44
Subject: Removes all traces of the druid ranger extension
@@ -9,27 +9,27 @@ Subject: Removes all traces of the druid ranger extension
99
2 files changed, 3 deletions(-)
1010

1111
diff --git a/distribution/pom.xml b/distribution/pom.xml
12-
index f7e9766494..7c2573fbd4 100644
12+
index a1b2da00d3..51ce7563ea 100644
1313
--- a/distribution/pom.xml
1414
+++ b/distribution/pom.xml
15-
@@ -460,8 +460,6 @@
16-
<argument>org.apache.druid.extensions.contrib:druid-rabbit-indexing-service</argument>
15+
@@ -448,8 +448,6 @@
1716
<argument>-c</argument>
1817
<argument>org.apache.druid.extensions.contrib:grpc-query</argument>
19-
- <argument>-c</argument>
18+
<argument>-c</argument>
2019
- <argument>org.apache.druid.extensions.contrib:druid-ranger-security</argument>
20+
- <argument>-c</argument>
21+
<argument>org.apache.druid.extensions.contrib:druid-exact-count-bitmap</argument>
2122
</arguments>
2223
</configuration>
23-
</execution>
2424
diff --git a/pom.xml b/pom.xml
25-
index 35ebdfdc34..829ddbd9e7 100644
25+
index 614ab31c09..6548d3a661 100644
2626
--- a/pom.xml
2727
+++ b/pom.xml
28-
@@ -260,7 +260,6 @@
28+
@@ -266,7 +266,6 @@
2929
<module>extensions-contrib/druid-deltalake-extensions</module>
3030
<module>extensions-contrib/spectator-histogram</module>
3131
<module>extensions-contrib/rabbit-stream-indexing-service</module>
3232
- <module>extensions-contrib/druid-ranger-security</module>
3333
<!-- distribution packaging -->
3434
<module>distribution</module>
35-
<!-- Revised integration tests -->
35+
<!-- more test stuff -->

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From c836d04ca08c6f341817096dcca7d8231c25ed66 Mon Sep 17 00:00:00 2001
1+
From 9b08e71ee25e9d47818f7a8dd3a741027d19d667 Mon Sep 17 00:00:00 2001
22
From: xeniape <xenia.fischer@stackable.tech>
33
Date: Mon, 22 Sep 2025 14:23:11 +0200
44
Subject: Include Prometheus emitter in distribution
55

66
---
7-
distribution/pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++
8-
1 file changed, 46 insertions(+)
7+
distribution/pom.xml | 45 ++++++++++++++++++++++++++++++++++++++++++++
8+
1 file changed, 45 insertions(+)
99

1010
diff --git a/distribution/pom.xml b/distribution/pom.xml
11-
index 7c2573fbd4..21954e8fb4 100644
11+
index 51ce7563ea..28dc3f6a5f 100644
1212
--- a/distribution/pom.xml
1313
+++ b/distribution/pom.xml
14-
@@ -468,6 +468,52 @@
14+
@@ -457,5 +457,50 @@
1515
</plugins>
1616
</build>
1717
</profile>
@@ -50,7 +50,6 @@ index 7c2573fbd4..21954e8fb4 100644
5050
+ <argument>${project.parent.version}</argument>
5151
+ <argument>-l</argument>
5252
+ <argument>${settings.localRepository}</argument>
53-
+ <argument>--no-default-hadoop</argument>
5453
+ <argument>-c</argument>
5554
+ <argument>org.apache.druid.extensions.contrib:prometheus-emitter</argument>
5655
+ </arguments>
@@ -61,6 +60,5 @@ index 7c2573fbd4..21954e8fb4 100644
6160
+ </plugins>
6261
+ </build>
6362
+ </profile>
64-
<profile>
65-
<id>integration-test</id>
66-
<activation>
63+
</profiles>
64+
</project>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8a1e8f9c4eaa419bb59825e645cbacd0b4ec7d34 Mon Sep 17 00:00:00 2001
1+
From de614889d64315022c6f4bd1e96d211accd5061e Mon Sep 17 00:00:00 2001
22
From: xeniape <xenia.fischer@stackable.tech>
33
Date: Tue, 23 Sep 2025 09:31:00 +0200
44
Subject: Stop building unused extensions.
@@ -11,19 +11,21 @@ extensions from the build.
1111
1 file changed, 29 deletions(-)
1212

1313
diff --git a/pom.xml b/pom.xml
14-
index 829ddbd9e7..369550e166 100644
14+
index 6548d3a661..d252009bc4 100644
1515
--- a/pom.xml
1616
+++ b/pom.xml
17-
@@ -229,37 +229,8 @@
18-
<module>extensions-core/testing-tools</module>
17+
@@ -235,37 +235,8 @@
18+
<module>extensions-core/druid-testcontainers</module>
1919
<!-- Community extensions -->
2020
<module>extensions-contrib/compressed-bigdecimal</module>
2121
- <module>extensions-contrib/influx-extensions</module>
2222
- <module>extensions-contrib/cassandra-storage</module>
2323
- <module>extensions-contrib/dropwizard-emitter</module>
2424
- <module>extensions-contrib/cloudfiles-extensions</module>
25+
- <module>extensions-contrib/consul-extensions</module>
2526
- <module>extensions-contrib/graphite-emitter</module>
2627
- <module>extensions-contrib/distinctcount</module>
28+
- <module>extensions-contrib/druid-exact-count-bitmap</module>
2729
- <module>extensions-contrib/statsd-emitter</module>
2830
- <module>extensions-contrib/time-min-max</module>
2931
- <module>extensions-contrib/virtual-columns</module>
@@ -33,8 +35,6 @@ index 829ddbd9e7..369550e166 100644
3335
<module>extensions-contrib/kafka-emitter</module>
3436
- <module>extensions-contrib/redis-cache</module>
3537
- <module>extensions-contrib/opentsdb-emitter</module>
36-
- <module>extensions-contrib/materialized-view-maintenance</module>
37-
- <module>extensions-contrib/materialized-view-selection</module>
3838
- <module>extensions-contrib/momentsketch</module>
3939
- <module>extensions-contrib/moving-average-query</module>
4040
- <module>extensions-contrib/tdigestsketch</module>
@@ -51,4 +51,4 @@ index 829ddbd9e7..369550e166 100644
5151
- <module>extensions-contrib/rabbit-stream-indexing-service</module>
5252
<!-- distribution packaging -->
5353
<module>distribution</module>
54-
<!-- Revised integration tests -->
54+
<!-- more test stuff -->

druid/stackable/patches/34.0.0/0005-Include-jackson-dataformat-xml-dependency.patch renamed to druid/stackable/patches/37.0.0/0004-Include-jackson-dataformat-xml-dependency.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 602c632042726fb4f71302d18144b540df8b42e9 Mon Sep 17 00:00:00 2001
1+
From 5ac5b65cf47f4ab2f45d4e0123b3c1ccb0d3cb24 Mon Sep 17 00:00:00 2001
22
From: xeniape <xenia.fischer@stackable.tech>
33
Date: Tue, 23 Sep 2025 09:42:41 +0200
44
Subject: Include jackson-dataformat-xml dependency.
@@ -12,12 +12,12 @@ build.
1212
1 file changed, 5 insertions(+)
1313

1414
diff --git a/server/pom.xml b/server/pom.xml
15-
index fbe2a2a480..f099199c01 100644
15+
index 06f26c6da6..79e0dafe5f 100644
1616
--- a/server/pom.xml
1717
+++ b/server/pom.xml
18-
@@ -218,6 +218,11 @@
18+
@@ -212,6 +212,11 @@
19+
<groupId>org.checkerframework</groupId>
1920
<artifactId>checker-qual</artifactId>
20-
<version>${checkerframework.version}</version>
2121
</dependency>
2222
+ <dependency>
2323
+ <!-- This is an optional dependency of log4j which is needed to use XmlLayout -->

druid/stackable/patches/34.0.0/0006-Stop-building-the-tar.gz-distribution.patch renamed to druid/stackable/patches/37.0.0/0005-Stop-building-the-tar.gz-distribution.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 781c8de56f5b6f0d050133f268cff7f9a1bceec9 Mon Sep 17 00:00:00 2001
1+
From bf9e0cce3d73dca46905dcaed733ceb090dc91a1 Mon Sep 17 00:00:00 2001
22
From: xeniape <xenia.fischer@stackable.tech>
33
Date: Tue, 23 Sep 2025 09:42:51 +0200
44
Subject: Stop building the tar.gz distribution.
@@ -10,7 +10,7 @@ again. So, instead we just skip the compression step entirely.
1010
1 file changed, 1 insertion(+), 1 deletion(-)
1111

1212
diff --git a/distribution/src/assembly/assembly.xml b/distribution/src/assembly/assembly.xml
13-
index ff8e0d2fdd..f9daa49e21 100644
13+
index 2b510ea85d..0fe10032ca 100644
1414
--- a/distribution/src/assembly/assembly.xml
1515
+++ b/distribution/src/assembly/assembly.xml
1616
@@ -23,7 +23,7 @@
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
From 29b11c3292df341dda8216587faa4972cb3000b8 Mon Sep 17 00:00:00 2001
2+
From: Nick Larsen <nick.larsen@stackable.tech>
3+
Date: Tue, 16 Jun 2026 13:18:46 +0200
4+
Subject: Update CycloneDX plugin
5+
6+
---
7+
pom.xml | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/pom.xml b/pom.xml
11+
index d252009bc4..a4a8f0e1e8 100644
12+
--- a/pom.xml
13+
+++ b/pom.xml
14+
@@ -1969,7 +1969,7 @@
15+
<plugin>
16+
<groupId>org.cyclonedx</groupId>
17+
<artifactId>cyclonedx-maven-plugin</artifactId>
18+
- <version>2.7.9</version>
19+
+ <version>2.9.1</version>
20+
<executions>
21+
<execution>
22+
<phase>package</phase>

0 commit comments

Comments
 (0)