Skip to content

Commit 1cb9a99

Browse files
dervoetidervoeti
committed
feat(druid): Add version 31.0.1
1 parent 82591c6 commit 1cb9a99

13 files changed

+467
-1
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
1414
command logger which allows to enter messages into the system log.
1515
- vector: Add version 0.43.1 ([#980]).
1616
- opa: Add version 1.0.0 ([#981])
17+
- druid: Add version 31.0.1 ([#984])
1718

1819
### Removed
1920

@@ -36,6 +37,7 @@ All notable changes to this project will be documented in this file.
3637
[#962]: https://github.com/stackabletech/docker-images/pull/962
3738
[#980]: https://github.com/stackabletech/docker-images/pull/980
3839
[#981]: https://github.com/stackabletech/docker-images/pull/981
40+
[#984]: https://github.com/stackabletech/docker-images/pull/984
3941

4042
## [24.11.1] - 2025-01-14
4143

‎druid/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN <<EOF
1818
microdnf update
1919

2020
# python-pyyaml:
21-
# This note was last checked for version 30.0.0
21+
# This note was last checked for version 31.0.1
2222
# Required for the compilation of Druid.
2323
# This requirement is documented in docs/development/build.md and version 5.1 or later is required.
2424
# UBI 9 ships with 5.4.x so that should be fine

‎druid/stackable/patches/31.0.1/01-remove-ranger-security.patch

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
Removes all traces of the druid ranger extension
2+
3+
From: Lars Francke <git@lars-francke.de>
4+
5+
6+
---
7+
0 files changed
8+
9+
diff --git a/distribution/pom.xml b/distribution/pom.xml
10+
index 0f17a8c877..d7cd645767 100644
11+
--- a/distribution/pom.xml
12+
+++ b/distribution/pom.xml
13+
@@ -252,8 +252,6 @@
14+
<argument>-c</argument>
15+
<argument>org.apache.druid.extensions:druid-pac4j</argument>
16+
<argument>-c</argument>
17+
- <argument>org.apache.druid.extensions:druid-ranger-security</argument>
18+
- <argument>-c</argument>
19+
<argument>org.apache.druid.extensions:druid-kubernetes-extensions</argument>
20+
<argument>-c</argument>
21+
<argument>org.apache.druid.extensions:druid-catalog</argument>
22+
diff --git a/pom.xml b/pom.xml
23+
index cfca79dc6e..2acb812cbe 100644
24+
--- a/pom.xml
25+
+++ b/pom.xml
26+
@@ -199,7 +199,6 @@
27+
<module>extensions-core/simple-client-sslcontext</module>
28+
<module>extensions-core/druid-basic-security</module>
29+
<module>extensions-core/google-extensions</module>
30+
- <module>extensions-core/druid-ranger-security</module>
31+
<module>extensions-core/druid-catalog</module>
32+
<module>extensions-core/testing-tools</module>
33+
<!-- Community extensions -->

‎druid/stackable/patches/31.0.1/02-prometheus-emitter-from-source.patch

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

‎druid/stackable/patches/31.0.1/03-stop-building-unused-extensions.patch

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
Stop building unused extensions.
2+
3+
From: Lars Francke <git@lars-francke.de>
4+
5+
By default Druid builds all community extensions and then discards them
6+
while assembling the final distribution. This patch removes unused
7+
extensions from the build.
8+
---
9+
0 files changed
10+
11+
diff --git a/pom.xml b/pom.xml
12+
index 2acb812cbe..38e0ddc61a 100644
13+
--- a/pom.xml
14+
+++ b/pom.xml
15+
@@ -201,39 +201,9 @@
16+
<module>extensions-core/google-extensions</module>
17+
<module>extensions-core/druid-catalog</module>
18+
<module>extensions-core/testing-tools</module>
19+
+
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/kubernetes-overlord-extensions</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+
54+
<!-- distribution packaging -->
55+
<module>distribution</module>

‎druid/stackable/patches/31.0.1/04-update-patch-dependencies.patch

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

‎druid/stackable/patches/31.0.1/05-xmllayout-dependencies.patch

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Include jackson-dataformat-xml dependency.
2+
3+
From: Lars Francke <git@lars-francke.de>
4+
5+
This allows us to use XmlLayout for Log4jV2.
6+
By including it here as a dependency we can make sure that we always have
7+
the matching version and we don't need to include it manually later in the
8+
build.
9+
---
10+
0 files changed
11+
12+
diff --git a/server/pom.xml b/server/pom.xml
13+
index 410b51480e..b7dcf46111 100644
14+
--- a/server/pom.xml
15+
+++ b/server/pom.xml
16+
@@ -205,6 +205,11 @@
17+
<groupId>org.apache.logging.log4j</groupId>
18+
<artifactId>log4j-core</artifactId>
19+
</dependency>
20+
+ <dependency>
21+
+ <!-- This is an optional dependency of log4j which is needed to use XmlLayout -->
22+
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
23+
+ <artifactId>jackson-dataformat-xml</artifactId>
24+
+ </dependency>
25+
<dependency>
26+
<groupId>com.fasterxml.jackson.datatype</groupId>
27+
<artifactId>jackson-datatype-joda</artifactId>

‎druid/stackable/patches/31.0.1/06-dont-build-targz.patch

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Stop building the tar.gz distribution.
2+
3+
From: Lars Francke <git@lars-francke.de>
4+
5+
All we do is build Druid tar and gzip it only to immediately uncompress it
6+
again. So, instead we just skip the compression step entirely.
7+
---
8+
distribution/src/assembly/assembly.xml | 2 +-
9+
1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+
diff --git a/distribution/src/assembly/assembly.xml b/distribution/src/assembly/assembly.xml
12+
index ff8e0d2fdd..f9daa49e21 100644
13+
--- a/distribution/src/assembly/assembly.xml
14+
+++ b/distribution/src/assembly/assembly.xml
15+
@@ -23,7 +23,7 @@
16+
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
17+
<id>bin</id>
18+
<formats>
19+
- <format>tar.gz</format>
20+
+ <format>dir</format>
21+
</formats>
22+
<fileSets>
23+
<fileSet>

‎druid/stackable/patches/31.0.1/07-cyclonedx-plugin.patch

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git a/pom.xml b/pom.xml
2+
index 9051ed2..10a2c85 100644
3+
--- a/pom.xml
4+
+++ b/pom.xml
5+
@@ -1728,7 +1728,11 @@
6+
<plugin>
7+
<groupId>org.cyclonedx</groupId>
8+
<artifactId>cyclonedx-maven-plugin</artifactId>
9+
- <version>2.7.9</version>
10+
+ <version>2.8.0</version>
11+
+ <configuration>
12+
+ <projectType>application</projectType>
13+
+ <schemaVersion>1.5</schemaVersion>
14+
+ </configuration>
15+
<executions>
16+
<execution>
17+
<phase>package</phase>

0 commit comments

Comments
 (0)