Skip to content

Commit 7e38b79

Browse files
NickLarsenNZNickLarsenNZ
committed
chore(druid): Add 33.0.0
1 parent 2491d45 commit 7e38b79

14 files changed

+513
-4
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
1111
- airflow: Add `2.10.5` ([#1108]).
1212
- druid: check for correct permissions and ownerships in /stackable folder via
1313
`check-permissions-ownership.sh` provided in stackable-base image ([#1039]).
14+
- druid: Add `33.0.0` ([#1110]).
1415
- hadoop: check for correct permissions and ownerships in /stackable folder via
1516
`check-permissions-ownership.sh` provided in stackable-base image ([#1029]).
1617
- hbase: check for correct permissions and ownerships in /stackable folder via

‎druid/Dockerfile‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,15 @@ RUN --mount=type=cache,id=maven-${PRODUCT},uid=${STACKABLE_USER_UID},target=/sta
4848
<<EOF
4949
cd "$(/stackable/patchable --images-repo-root=src checkout druid ${PRODUCT})"
5050

51-
mvn --batch-mode --no-transfer-progress clean install -Pdist,stackable-bundle-contrib-exts -DskipTests -Dmaven.javadoc.skip=true
51+
mvn \
52+
--batch-mode \
53+
--no-transfer-progress \
54+
clean install \
55+
-Pdist,stackable-bundle-contrib-exts \
56+
-DskipTests \
57+
-Dmaven.javadoc.skip=true \
58+
-Dmaven.gitcommitid.skip=true
59+
5260
mv distribution/target/apache-druid-${PRODUCT}-bin/apache-druid-${PRODUCT} /stackable/
5361
mv distribution/target/bom.json /stackable/apache-druid-${PRODUCT}/apache-druid-${PRODUCT}.cdx.json
5462
rm -rf /stackable/apache-druid-${PRODUCT}-src
@@ -58,9 +66,9 @@ rm -rf /stackable/apache-druid-${PRODUCT}-src
5866
# and we are sometimes running into errors because we're out of space.
5967
# Therefore, we try to clean up all layers as much as possible.
6068
if [ "${DELETE_CACHES}" = "true" ] ; then
61-
rm -rf /stackable/.m2/repository/*
62-
rm -rf /stackable/.npm/*
63-
rm -rf /stackable/.cache/*
69+
rm -rf /stackable/.m2/repository/*
70+
rm -rf /stackable/.npm/*
71+
rm -rf /stackable/.cache/*
6472
fi
6573

6674
# Do not remove the /stackable/apache-druid-${PRODUCT}/quickstart folder, it is needed for loading the Wikipedia

‎druid/stackable/patches/33.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 0517d9fb940879ced639eb0d717ba4b5f67d9670 Mon Sep 17 00:00:00 2001
2+
From: Lars Francke <[email protected]>
3+
Date: Wed, 10 Jul 2024 17:07:13 +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 8ee50f9029..cb54001d20 100644
13+
--- a/distribution/pom.xml
14+
+++ b/distribution/pom.xml
15+
@@ -458,8 +458,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 1f7d6a69df..09daa8b2e9 100644
26+
--- a/pom.xml
27+
+++ b/pom.xml
28+
@@ -258,7 +258,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/33.0.0/0002-Include-Prometheus-emitter-in-distribution.patch‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
From 7cd9440c7f484db79ca4a7b107fc0404dc9421a0 Mon Sep 17 00:00:00 2001
2+
From: Lars Francke <[email protected]>
3+
Date: Mon, 17 Feb 2025 16:42:34 +0100
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 cb54001d20..c8b7e13054 100644
12+
--- a/distribution/pom.xml
13+
+++ b/distribution/pom.xml
14+
@@ -466,6 +466,52 @@
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+
<profile>
65+
<id>integration-test</id>
66+
<activation>

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
From 2259629e248db402a660b42d7eca75f17e164b7f Mon Sep 17 00:00:00 2001
2+
From: Lars Francke <[email protected]>
3+
Date: Mon, 17 Feb 2025 16:42:34 +0100
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 | 31 -------------------------------
11+
1 file changed, 31 deletions(-)
12+
13+
diff --git a/pom.xml b/pom.xml
14+
index 09daa8b2e9..df781fac63 100644
15+
--- a/pom.xml
16+
+++ b/pom.xml
17+
@@ -226,38 +226,7 @@
18+
<module>extensions-core/druid-catalog</module>
19+
<module>extensions-core/testing-tools</module>
20+
<!-- Community extensions -->
21+
- <module>extensions-contrib/compressed-bigdecimal</module>
22+
- <module>extensions-contrib/influx-extensions</module>
23+
- <module>extensions-contrib/cassandra-storage</module>
24+
- <module>extensions-contrib/dropwizard-emitter</module>
25+
- <module>extensions-contrib/cloudfiles-extensions</module>
26+
- <module>extensions-contrib/graphite-emitter</module>
27+
- <module>extensions-contrib/distinctcount</module>
28+
- <module>extensions-contrib/statsd-emitter</module>
29+
- <module>extensions-contrib/time-min-max</module>
30+
- <module>extensions-contrib/virtual-columns</module>
31+
- <module>extensions-contrib/thrift-extensions</module>
32+
- <module>extensions-contrib/ambari-metrics-emitter</module>
33+
- <module>extensions-contrib/sqlserver-metadata-storage</module>
34+
- <module>extensions-contrib/kafka-emitter</module>
35+
- <module>extensions-contrib/redis-cache</module>
36+
- <module>extensions-contrib/opentsdb-emitter</module>
37+
- <module>extensions-contrib/materialized-view-maintenance</module>
38+
- <module>extensions-contrib/materialized-view-selection</module>
39+
- <module>extensions-contrib/momentsketch</module>
40+
- <module>extensions-contrib/moving-average-query</module>
41+
- <module>extensions-contrib/tdigestsketch</module>
42+
- <module>extensions-contrib/ddsketch</module>
43+
- <module>extensions-contrib/influxdb-emitter</module>
44+
- <module>extensions-contrib/gce-extensions</module>
45+
- <module>extensions-contrib/aliyun-oss-extensions</module>
46+
<module>extensions-contrib/prometheus-emitter</module>
47+
- <module>extensions-contrib/opentelemetry-emitter</module>
48+
- <module>extensions-contrib/grpc-query</module>
49+
- <module>extensions-contrib/druid-iceberg-extensions</module>
50+
- <module>extensions-contrib/druid-deltalake-extensions</module>
51+
- <module>extensions-contrib/spectator-histogram</module>
52+
- <module>extensions-contrib/rabbit-stream-indexing-service</module>
53+
<!-- distribution packaging -->
54+
<module>distribution</module>
55+
<!-- Revised integration tests -->

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

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
From 14b8c8cb1ce5e458ca8d1ff3cafa8adfa86c6c91 Mon Sep 17 00:00:00 2001
2+
From: Lars Francke <[email protected]>
3+
Date: Mon, 17 Feb 2025 16:42:49 +0100
4+
Subject: Updates all dependencies that have a new patch release available.
5+
6+
---
7+
extensions-core/druid-pac4j/pom.xml | 2 +-
8+
extensions-core/kubernetes-extensions/pom.xml | 2 +-
9+
extensions-core/orc-extensions/pom.xml | 2 +-
10+
pom.xml | 28 +++++++++++--------
11+
processing/pom.xml | 2 +-
12+
5 files changed, 21 insertions(+), 15 deletions(-)
13+
14+
diff --git a/extensions-core/druid-pac4j/pom.xml b/extensions-core/druid-pac4j/pom.xml
15+
index 7f20428b10..b11e324c6a 100644
16+
--- a/extensions-core/druid-pac4j/pom.xml
17+
+++ b/extensions-core/druid-pac4j/pom.xml
18+
@@ -34,7 +34,7 @@
19+
</parent>
20+
21+
<properties>
22+
- <pac4j.version>4.5.7</pac4j.version>
23+
+ <pac4j.version>4.5.8</pac4j.version>
24+
25+
<!-- 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-->
26+
<nimbus.lang.tag.version>1.7</nimbus.lang.tag.version>
27+
diff --git a/extensions-core/kubernetes-extensions/pom.xml b/extensions-core/kubernetes-extensions/pom.xml
28+
index a910172cae..549de276f7 100644
29+
--- a/extensions-core/kubernetes-extensions/pom.xml
30+
+++ b/extensions-core/kubernetes-extensions/pom.xml
31+
@@ -34,7 +34,7 @@
32+
</parent>
33+
34+
<properties>
35+
- <kubernetes.client.version>19.0.0</kubernetes.client.version>
36+
+ <kubernetes.client.version>19.0.2</kubernetes.client.version>
37+
</properties>
38+
39+
40+
diff --git a/extensions-core/orc-extensions/pom.xml b/extensions-core/orc-extensions/pom.xml
41+
index c790639e41..9fb910a86f 100644
42+
--- a/extensions-core/orc-extensions/pom.xml
43+
+++ b/extensions-core/orc-extensions/pom.xml
44+
@@ -31,7 +31,7 @@
45+
</parent>
46+
<modelVersion>4.0.0</modelVersion>
47+
<properties>
48+
- <orc.version>1.7.6</orc.version>
49+
+ <orc.version>1.7.11</orc.version>
50+
</properties>
51+
<dependencies>
52+
<dependency>
53+
diff --git a/pom.xml b/pom.xml
54+
index df781fac63..7a7cbea9de 100644
55+
--- a/pom.xml
56+
+++ b/pom.xml
57+
@@ -73,7 +73,7 @@
58+
<java.version>11</java.version>
59+
<maven.compiler.release>${java.version}</maven.compiler.release>
60+
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
61+
- <aether.version>0.9.0.M2</aether.version>
62+
+ <aether.version>0.9.1.v20140329</aether.version>
63+
<apache.curator.version>5.5.0</apache.curator.version>
64+
<apache.kafka.version>3.9.0</apache.kafka.version>
65+
<!-- when updating apache ranger, verify the usage of aws-bundle-sdk vs aws-logs-sdk
66+
@@ -90,24 +90,27 @@
67+
<confluent.version>6.2.12</confluent.version>
68+
<cronutils.version>9.2.0</cronutils.version>
69+
<datasketches.version>4.2.0</datasketches.version>
70+
- <datasketches.memory.version>2.2.0</datasketches.memory.version>
71+
+ <datasketches.memory.version>2.2.1</datasketches.memory.version>
72+
<derby.version>10.14.2.0</derby.version>
73+
- <dropwizard.metrics.version>4.2.22</dropwizard.metrics.version>
74+
+ <dropwizard.metrics.version>4.2.30</dropwizard.metrics.version>
75+
<errorprone.version>2.35.1</errorprone.version>
76+
- <fastutil.version>8.5.4</fastutil.version>
77+
+ <!-- An additional null check was introduced in fastutils 8.5.7 that breaks data ingestion tasks:
78+
+ https://github.com/stackabletech/druid-operator/issues/595
79+
+ https://github.com/vigna/fastutil/commit/598a4fd064e193be69ea324aa86947477c82ede8 -->
80+
+ <fastutil.version>8.5.6</fastutil.version>
81+
<guava.version>32.0.1-jre</guava.version>
82+
<guice.version>5.1.0</guice.version>
83+
<hamcrest.version>1.3</hamcrest.version>
84+
<jetty.version>9.4.57.v20241219</jetty.version>
85+
<jersey.version>1.19.4</jersey.version>
86+
- <jackson.version>2.12.7.20221012</jackson.version>
87+
- <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
88+
+ <jackson.version>2.12.7.20240502</jackson.version>
89+
+ <codehaus.jackson.version>1.9.14-MULE-002</codehaus.jackson.version>
90+
<log4j.version>2.22.1</log4j.version>
91+
<mysql.version>8.2.0</mysql.version>
92+
<mariadb.version>2.7.3</mariadb.version>
93+
<netty3.version>3.10.6.Final</netty3.version>
94+
<netty4.version>4.1.118.Final</netty4.version>
95+
- <postgresql.version>42.7.2</postgresql.version>
96+
+ <postgresql.version>42.7.5</postgresql.version>
97+
<protobuf.version>3.25.5</protobuf.version>
98+
<resilience4j.version>1.3.1</resilience4j.version>
99+
<slf4j.version>1.7.36</slf4j.version>
100+
@@ -116,17 +119,20 @@
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+
- <aws.sdk.version>1.12.638</aws.sdk.version>
105+
- <caffeine.version>2.8.0</caffeine.version>
106+
+ <!-- mockito-inline artifact was removed in mockito 5.3 (mockito 5.x is required for Java >17),
107+
+ 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) -->
108+
+ <mockito.inline.artifact>core</mockito.inline.artifact>
109+
+ <aws.sdk.version>1.12.780</aws.sdk.version>
110+
+ <caffeine.version>2.8.8</caffeine.version>
111+
<jacoco.version>0.8.12</jacoco.version>
112+
<hibernate-validator.version>6.2.5.Final</hibernate-validator.version>
113+
- <httpclient.version>4.5.13</httpclient.version>
114+
+ <httpclient.version>4.5.14</httpclient.version>
115+
<!-- When upgrading ZK, edit docs and integration tests as well (integration-tests/docker-base/setup.sh) -->
116+
<zookeeper.version>3.8.4</zookeeper.version>
117+
<checkerframework.version>3.48.1</checkerframework.version>
118+
<com.google.apis.client.version>2.2.0</com.google.apis.client.version>
119+
<com.google.http.client.apis.version>1.42.3</com.google.http.client.apis.version>
120+
- <com.google.apis.compute.version>v1-rev20230606-2.0.0</com.google.apis.compute.version>
121+
+ <com.google.apis.compute.version>v1-rev20250107-2.0.0</com.google.apis.compute.version>
122+
<com.google.cloud.storage.version>2.29.1</com.google.cloud.storage.version>
123+
<jdk.strong.encapsulation.argLine>
124+
<!-- Strong encapsulation parameters -->
125+
diff --git a/processing/pom.xml b/processing/pom.xml
126+
index a43f1262d0..8cc22d5195 100644
127+
--- a/processing/pom.xml
128+
+++ b/processing/pom.xml
129+
@@ -36,7 +36,7 @@
130+
<sigar.base.version>1.6.5</sigar.base.version>
131+
<sigar.version>${sigar.base.version}.132</sigar.version>
132+
<ipaddress.version>5.3.4</ipaddress.version>
133+
- <oshi.version>6.4.4</oshi.version>
134+
+ <oshi.version>6.4.13</oshi.version>
135+
</properties>
136+
137+
<dependencies>

‎druid/stackable/patches/33.0.0/0005-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 3df406a5c0d69a24d3ae8e4ef372fab058bf5279 Mon Sep 17 00:00:00 2001
2+
From: Lars Francke <[email protected]>
3+
Date: Mon, 17 Feb 2025 16:42:49 +0100
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 468a40d9f0..0ffcfd60b9 100644
16+
--- a/server/pom.xml
17+
+++ b/server/pom.xml
18+
@@ -218,6 +218,11 @@
19+
<artifactId>checker-qual</artifactId>
20+
<version>${checkerframework.version}</version>
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/33.0.0/0006-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 88931513218f65a4f378fefb281cbf0dcc872563 Mon Sep 17 00:00:00 2001
2+
From: Lars Francke <[email protected]>
3+
Date: Mon, 17 Feb 2025 16:42:49 +0100
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 ff8e0d2fdd..f9daa49e21 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>

0 commit comments

Comments
 (0)