Skip to content

Commit 124384b

Browse files
NickLarsenNZNickLarsenNZ
committed
feat(druid) Add 37.0.0
1 parent 21ad911 commit 124384b

11 files changed

Lines changed: 419 additions & 3 deletions

‎druid/boil-config.toml‎

Lines changed: 15 additions & 3 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,12 +11,24 @@ java-devel = "17"
1111
[versions."30.0.1".build-arguments]
1212
authorizer-version = "0.7.0"
1313

14-
# Supported
14+
# Deprecated since 26.7
1515
[versions."35.0.1".local-images]
1616
# https://druid.apache.org/docs/35.0.1/operations/java/
1717
java-base = "21"
1818
java-devel = "21"
19-
"hadoop/hadoop" = "3.4.2" # TODO: Bump to 3.4.3
19+
"hadoop/hadoop" = "3.4.3"
2020

2121
[versions."35.0.1".build-arguments]
2222
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/37.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 319acbb818938c36b27f875e243c157dfc32fff4 Mon Sep 17 00:00:00 2001
2+
From: xeniape <xenia.fischer@stackable.tech>
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 a1b2da00d3..51ce7563ea 100644
13+
--- a/distribution/pom.xml
14+
+++ b/distribution/pom.xml
15+
@@ -448,8 +448,6 @@
16+
<argument>-c</argument>
17+
<argument>org.apache.druid.extensions.contrib:grpc-query</argument>
18+
<argument>-c</argument>
19+
- <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>
22+
</arguments>
23+
</configuration>
24+
diff --git a/pom.xml b/pom.xml
25+
index 614ab31c09..6548d3a661 100644
26+
--- a/pom.xml
27+
+++ b/pom.xml
28+
@@ -266,7 +266,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+
<!-- more test stuff -->

‎druid/stackable/patches/37.0.0/0002-Include-Prometheus-emitter-in-distribution.patch‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
From bd9e330c263c4934fdf1db5aab9ebaad052e96a1 Mon Sep 17 00:00:00 2001
2+
From: xeniape <xenia.fischer@stackable.tech>
3+
Date: Mon, 22 Sep 2025 14:23:11 +0200
4+
Subject: Include Prometheus emitter in distribution
5+
6+
---
7+
distribution/pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++
8+
1 file changed, 46 insertions(+)
9+
10+
diff --git a/distribution/pom.xml b/distribution/pom.xml
11+
index 51ce7563ea..c238ef8946 100644
12+
--- a/distribution/pom.xml
13+
+++ b/distribution/pom.xml
14+
@@ -457,5 +457,51 @@
15+
</plugins>
16+
</build>
17+
</profile>
18+
+ <profile>
19+
+ <id>stackable-bundle-contrib-exts</id>
20+
+ <activation>
21+
+ <activeByDefault>true</activeByDefault>
22+
+ </activation>
23+
+ <build>
24+
+ <plugins>
25+
+ <plugin>
26+
+ <groupId>org.codehaus.mojo</groupId>
27+
+ <artifactId>exec-maven-plugin</artifactId>
28+
+ <executions>
29+
+ <execution>
30+
+ <id>pull-deps-contrib-exts</id>
31+
+ <phase>package</phase>
32+
+ <goals>
33+
+ <goal>exec</goal>
34+
+ </goals>
35+
+ <configuration>
36+
+ <executable>${project.parent.basedir}/examples/bin/run-java</executable>
37+
+ <arguments>
38+
+ <argument>-classpath</argument>
39+
+ <classpath />
40+
+ <argument>-Ddruid.extensions.loadList=[]</argument>
41+
+ <argument>-Ddruid.extensions.directory=${project.build.directory}/extensions
42+
+ </argument>
43+
+ <argument>
44+
+ -Ddruid.extensions.hadoopDependenciesDir=${project.build.directory}/hadoop-dependencies
45+
+ </argument>
46+
+ <argument>org.apache.druid.cli.Main</argument>
47+
+ <argument>tools</argument>
48+
+ <argument>pull-deps</argument>
49+
+ <argument>--defaultVersion</argument>
50+
+ <argument>${project.parent.version}</argument>
51+
+ <argument>-l</argument>
52+
+ <argument>${settings.localRepository}</argument>
53+
+ <argument>--no-default-hadoop</argument>
54+
+ <argument>-c</argument>
55+
+ <argument>org.apache.druid.extensions.contrib:prometheus-emitter</argument>
56+
+ </arguments>
57+
+ </configuration>
58+
+ </execution>
59+
+ </executions>
60+
+ </plugin>
61+
+ </plugins>
62+
+ </build>
63+
+ </profile>
64+
</profiles>
65+
</project>

‎druid/stackable/patches/37.0.0/0003-Stop-building-unused-extensions.patch‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
From 62239df37ea08117560b9c57e5242bfe7fb8bdb2 Mon Sep 17 00:00:00 2001
2+
From: xeniape <xenia.fischer@stackable.tech>
3+
Date: Tue, 23 Sep 2025 09:31:00 +0200
4+
Subject: Stop building unused extensions.
5+
6+
By default Druid builds all community extensions and then discards them
7+
while assembling the final distribution. This patch removes unused
8+
extensions from the build.
9+
---
10+
pom.xml | 29 -----------------------------
11+
1 file changed, 29 deletions(-)
12+
13+
diff --git a/pom.xml b/pom.xml
14+
index 6548d3a661..d252009bc4 100644
15+
--- a/pom.xml
16+
+++ b/pom.xml
17+
@@ -235,37 +235,8 @@
18+
<module>extensions-core/druid-testcontainers</module>
19+
<!-- Community extensions -->
20+
<module>extensions-contrib/compressed-bigdecimal</module>
21+
- <module>extensions-contrib/influx-extensions</module>
22+
- <module>extensions-contrib/cassandra-storage</module>
23+
- <module>extensions-contrib/dropwizard-emitter</module>
24+
- <module>extensions-contrib/cloudfiles-extensions</module>
25+
- <module>extensions-contrib/consul-extensions</module>
26+
- <module>extensions-contrib/graphite-emitter</module>
27+
- <module>extensions-contrib/distinctcount</module>
28+
- <module>extensions-contrib/druid-exact-count-bitmap</module>
29+
- <module>extensions-contrib/statsd-emitter</module>
30+
- <module>extensions-contrib/time-min-max</module>
31+
- <module>extensions-contrib/virtual-columns</module>
32+
- <module>extensions-contrib/thrift-extensions</module>
33+
- <module>extensions-contrib/ambari-metrics-emitter</module>
34+
- <module>extensions-contrib/sqlserver-metadata-storage</module>
35+
<module>extensions-contrib/kafka-emitter</module>
36+
- <module>extensions-contrib/redis-cache</module>
37+
- <module>extensions-contrib/opentsdb-emitter</module>
38+
- <module>extensions-contrib/momentsketch</module>
39+
- <module>extensions-contrib/moving-average-query</module>
40+
- <module>extensions-contrib/tdigestsketch</module>
41+
- <module>extensions-contrib/ddsketch</module>
42+
- <module>extensions-contrib/influxdb-emitter</module>
43+
- <module>extensions-contrib/gce-extensions</module>
44+
- <module>extensions-contrib/aliyun-oss-extensions</module>
45+
<module>extensions-contrib/prometheus-emitter</module>
46+
- <module>extensions-contrib/opentelemetry-emitter</module>
47+
- <module>extensions-contrib/grpc-query</module>
48+
- <module>extensions-contrib/druid-iceberg-extensions</module>
49+
- <module>extensions-contrib/druid-deltalake-extensions</module>
50+
- <module>extensions-contrib/spectator-histogram</module>
51+
- <module>extensions-contrib/rabbit-stream-indexing-service</module>
52+
<!-- distribution packaging -->
53+
<module>distribution</module>
54+
<!-- more test stuff -->

‎druid/stackable/patches/37.0.0/0004-Include-jackson-dataformat-xml-dependency.patch‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From 63a7e2865e5d21eb0be7474287101e1fd66325e6 Mon Sep 17 00:00:00 2001
2+
From: xeniape <xenia.fischer@stackable.tech>
3+
Date: Tue, 23 Sep 2025 09:42:41 +0200
4+
Subject: Include jackson-dataformat-xml dependency.
5+
6+
This allows us to use XmlLayout for Log4jV2.
7+
By including it here as a dependency we can make sure that we always have
8+
the matching version and we don't need to include it manually later in the
9+
build.
10+
---
11+
server/pom.xml | 5 +++++
12+
1 file changed, 5 insertions(+)
13+
14+
diff --git a/server/pom.xml b/server/pom.xml
15+
index 06f26c6da6..79e0dafe5f 100644
16+
--- a/server/pom.xml
17+
+++ b/server/pom.xml
18+
@@ -212,6 +212,11 @@
19+
<groupId>org.checkerframework</groupId>
20+
<artifactId>checker-qual</artifactId>
21+
</dependency>
22+
+ <dependency>
23+
+ <!-- This is an optional dependency of log4j which is needed to use XmlLayout -->
24+
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
25+
+ <artifactId>jackson-dataformat-xml</artifactId>
26+
+ </dependency>
27+
<dependency>
28+
<groupId>com.fasterxml.jackson.datatype</groupId>
29+
<artifactId>jackson-datatype-joda</artifactId>

‎druid/stackable/patches/37.0.0/0005-Stop-building-the-tar.gz-distribution.patch‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 855139430282a4d12ffdad20d62ce9753a236b38 Mon Sep 17 00:00:00 2001
2+
From: xeniape <xenia.fischer@stackable.tech>
3+
Date: Tue, 23 Sep 2025 09:42:51 +0200
4+
Subject: Stop building the tar.gz distribution.
5+
6+
All we do is build Druid tar and gzip it only to immediately uncompress it
7+
again. So, instead we just skip the compression step entirely.
8+
---
9+
distribution/src/assembly/assembly.xml | 2 +-
10+
1 file changed, 1 insertion(+), 1 deletion(-)
11+
12+
diff --git a/distribution/src/assembly/assembly.xml b/distribution/src/assembly/assembly.xml
13+
index 2b510ea85d..0fe10032ca 100644
14+
--- a/distribution/src/assembly/assembly.xml
15+
+++ b/distribution/src/assembly/assembly.xml
16+
@@ -23,7 +23,7 @@
17+
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
18+
<id>bin</id>
19+
<formats>
20+
- <format>tar.gz</format>
21+
+ <format>dir</format>
22+
</formats>
23+
<fileSets>
24+
<fileSet>

‎druid/stackable/patches/37.0.0/0006-Update-CycloneDX-plugin.patch‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
From 89b19164bcae17bc8f12794afcaa13aa8f14a6ed 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>

‎druid/stackable/patches/37.0.0/0007-Update-FMPP-version.patch‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
From 289ac13b8e8b2f4b43b1db6b39a52b1df07cf260 Mon Sep 17 00:00:00 2001
2+
From: xeniape <xenia.fischer@stackable.tech>
3+
Date: Tue, 23 Sep 2025 09:43:41 +0200
4+
Subject: Update FMPP version
5+
6+
This is because FMPP Maven Plugin depends on FMPP in version 0.9.14
7+
which itself depends on a Freemarker version that has not been pinned.
8+
Instead it specifies a range which resolves to a SNAPSHOT version
9+
which we don't want.
10+
---
11+
sql/pom.xml | 7 +++++++
12+
1 file changed, 7 insertions(+)
13+
14+
diff --git a/sql/pom.xml b/sql/pom.xml
15+
index d62a265bbf..b8c07203bb 100644
16+
--- a/sql/pom.xml
17+
+++ b/sql/pom.xml
18+
@@ -382,6 +382,13 @@
19+
<plugin>
20+
<groupId>com.googlecode.fmpp-maven-plugin</groupId>
21+
<artifactId>fmpp-maven-plugin</artifactId>
22+
+ <dependencies>
23+
+ <dependency>
24+
+ <groupId>net.sourceforge.fmpp</groupId>
25+
+ <artifactId>fmpp</artifactId>
26+
+ <version>0.9.16</version>
27+
+ </dependency>
28+
+ </dependencies>
29+
<executions>
30+
<execution>
31+
<id>generate-fmpp-sources</id>

‎druid/stackable/patches/37.0.0/0008-Stop-building-the-embedded-integration-tests.patch‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
From 1f518eb907c67a2c2e4556f6797d0033add57cb2 Mon Sep 17 00:00:00 2001
2+
From: Techassi <git@techassi.dev>
3+
Date: Wed, 21 Jan 2026 11:32:20 +0100
4+
Subject: Stop building the embedded integration tests
5+
6+
---
7+
pom.xml | 1 -
8+
1 file changed, 1 deletion(-)
9+
10+
diff --git a/pom.xml b/pom.xml
11+
index a4a8f0e1e8..73ce663463 100644
12+
--- a/pom.xml
13+
+++ b/pom.xml
14+
@@ -241,7 +241,6 @@
15+
<module>distribution</module>
16+
<!-- more test stuff -->
17+
<module>quidem-ut</module>
18+
- <module>embedded-tests</module>
19+
</modules>
20+
21+
<repositories>

0 commit comments

Comments
 (0)