-
-
Couldn't load subscription status.
- Fork 6
chore(druid): Update image for 25.11.0 #1263
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
4cac4d1
chore(druid): Update image for 25.11.0
xeniape e90a744
Merge branch 'main' into chore/bump-druid-version-for-25.11.0
xeniape b907b1f
add changelog entry
xeniape da9a6fa
add new line
xeniape 8df1dce
add operator task
xeniape 3fbf932
add operator task
xeniape fb135aa
adjust update template
xeniape cda0887
adjust update template
xeniape 1150b61
adjust update template
xeniape 3bad2f5
Merge branch 'main' into chore/bump-druid-version-for-25.11.0
xeniape 939a8d6
revert merge change
xeniape File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 0 additions & 35 deletions
35
druid/stackable/patches/31.0.1/0001-Removes-all-traces-of-the-druid-ranger-extension.patch
This file was deleted.
Oops, something went wrong.
35 changes: 35 additions & 0 deletions
35
druid/stackable/patches/34.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| From 515da2a96db1835133e2b367d4c006ce4fcf8a3a Mon Sep 17 00:00:00 2001 | ||
| From: xeniape <[email protected]> | ||
| Date: Mon, 22 Sep 2025 14:20:53 +0200 | ||
| Subject: Removes all traces of the druid ranger extension | ||
|
|
||
| --- | ||
| distribution/pom.xml | 2 -- | ||
| pom.xml | 1 - | ||
| 2 files changed, 3 deletions(-) | ||
|
|
||
| diff --git a/distribution/pom.xml b/distribution/pom.xml | ||
| index f7e9766494..7c2573fbd4 100644 | ||
| --- a/distribution/pom.xml | ||
| +++ b/distribution/pom.xml | ||
| @@ -460,8 +460,6 @@ | ||
| <argument>org.apache.druid.extensions.contrib:druid-rabbit-indexing-service</argument> | ||
| <argument>-c</argument> | ||
| <argument>org.apache.druid.extensions.contrib:grpc-query</argument> | ||
| - <argument>-c</argument> | ||
| - <argument>org.apache.druid.extensions.contrib:druid-ranger-security</argument> | ||
| </arguments> | ||
| </configuration> | ||
| </execution> | ||
| diff --git a/pom.xml b/pom.xml | ||
| index 35ebdfdc34..829ddbd9e7 100644 | ||
| --- a/pom.xml | ||
| +++ b/pom.xml | ||
| @@ -260,7 +260,6 @@ | ||
| <module>extensions-contrib/druid-deltalake-extensions</module> | ||
| <module>extensions-contrib/spectator-histogram</module> | ||
| <module>extensions-contrib/rabbit-stream-indexing-service</module> | ||
| - <module>extensions-contrib/druid-ranger-security</module> | ||
| <!-- distribution packaging --> | ||
| <module>distribution</module> | ||
| <!-- Revised integration tests --> |
10 changes: 5 additions & 5 deletions
10
...-Prometheus-emitter-in-distribution.patch → ...-Prometheus-emitter-in-distribution.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| From 484bd7f13890823fdfdcbec5bd21b046ac885015 Mon Sep 17 00:00:00 2001 | ||
| From: Lars Francke <[email protected]> | ||
| Date: Mon, 17 Feb 2025 16:42:34 +0100 | ||
| From c836d04ca08c6f341817096dcca7d8231c25ed66 Mon Sep 17 00:00:00 2001 | ||
| From: xeniape <[email protected]> | ||
| Date: Mon, 22 Sep 2025 14:23:11 +0200 | ||
| Subject: Include Prometheus emitter in distribution | ||
|
|
||
| --- | ||
| distribution/pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++ | ||
| 1 file changed, 46 insertions(+) | ||
|
|
||
| diff --git a/distribution/pom.xml b/distribution/pom.xml | ||
| index 1a4f7df716..a28e34bb6a 100644 | ||
| index 7c2573fbd4..21954e8fb4 100644 | ||
| --- a/distribution/pom.xml | ||
| +++ b/distribution/pom.xml | ||
| @@ -464,6 +464,52 @@ | ||
| @@ -468,6 +468,52 @@ | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,23 @@ | ||
| From 540182e6a1169103cb77ff37d963186f23204800 Mon Sep 17 00:00:00 2001 | ||
| From: Lars Francke <[email protected]> | ||
| Date: Mon, 17 Feb 2025 16:42:34 +0100 | ||
| From 8a1e8f9c4eaa419bb59825e645cbacd0b4ec7d34 Mon Sep 17 00:00:00 2001 | ||
| From: xeniape <[email protected]> | ||
| Date: Tue, 23 Sep 2025 09:31:00 +0200 | ||
| Subject: Stop building unused extensions. | ||
|
|
||
| By default Druid builds all community extensions and then discards them | ||
| while assembling the final distribution. This patch removes unused | ||
| extensions from the build. | ||
| --- | ||
| pom.xml | 32 +------------------------------- | ||
| 1 file changed, 1 insertion(+), 31 deletions(-) | ||
| pom.xml | 29 ----------------------------- | ||
| 1 file changed, 29 deletions(-) | ||
|
|
||
| diff --git a/pom.xml b/pom.xml | ||
| index 807f9f11df..e9e19f7920 100644 | ||
| index 829ddbd9e7..369550e166 100644 | ||
| --- a/pom.xml | ||
| +++ b/pom.xml | ||
| @@ -200,39 +200,9 @@ | ||
| <module>extensions-core/google-extensions</module> | ||
| <module>extensions-core/druid-catalog</module> | ||
| @@ -229,37 +229,8 @@ | ||
| <module>extensions-core/testing-tools</module> | ||
| + | ||
| <!-- Community extensions --> | ||
| - <module>extensions-contrib/compressed-bigdecimal</module> | ||
| <module>extensions-contrib/compressed-bigdecimal</module> | ||
| - <module>extensions-contrib/influx-extensions</module> | ||
| - <module>extensions-contrib/cassandra-storage</module> | ||
| - <module>extensions-contrib/dropwizard-emitter</module> | ||
|
|
@@ -33,7 +30,7 @@ index 807f9f11df..e9e19f7920 100644 | |
| - <module>extensions-contrib/thrift-extensions</module> | ||
| - <module>extensions-contrib/ambari-metrics-emitter</module> | ||
| - <module>extensions-contrib/sqlserver-metadata-storage</module> | ||
| - <module>extensions-contrib/kafka-emitter</module> | ||
| <module>extensions-contrib/kafka-emitter</module> | ||
| - <module>extensions-contrib/redis-cache</module> | ||
| - <module>extensions-contrib/opentsdb-emitter</module> | ||
| - <module>extensions-contrib/materialized-view-maintenance</module> | ||
|
|
@@ -47,11 +44,11 @@ index 807f9f11df..e9e19f7920 100644 | |
| - <module>extensions-contrib/aliyun-oss-extensions</module> | ||
| <module>extensions-contrib/prometheus-emitter</module> | ||
| - <module>extensions-contrib/opentelemetry-emitter</module> | ||
| - <module>extensions-contrib/kubernetes-overlord-extensions</module> | ||
| - <module>extensions-contrib/grpc-query</module> | ||
| - <module>extensions-contrib/druid-iceberg-extensions</module> | ||
| - <module>extensions-contrib/druid-deltalake-extensions</module> | ||
| - <module>extensions-contrib/spectator-histogram</module> | ||
| - <module>extensions-contrib/rabbit-stream-indexing-service</module> | ||
|
|
||
| <!-- distribution packaging --> | ||
| <module>distribution</module> | ||
| <!-- Revised integration tests --> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,18 @@ | ||
| From 14918ed4cad073b1e62ba26111352dafd2da3ae0 Mon Sep 17 00:00:00 2001 | ||
| From: Lars Francke <[email protected]> | ||
| Date: Mon, 17 Feb 2025 16:42:49 +0100 | ||
| From 90757e20d151e2744f5206df1f6b9fdc1992d78a Mon Sep 17 00:00:00 2001 | ||
| From: xeniape <[email protected]> | ||
| Date: Tue, 23 Sep 2025 09:42:23 +0200 | ||
| Subject: Updates all dependencies that have a new patch release available. | ||
|
|
||
| --- | ||
| extensions-core/druid-pac4j/pom.xml | 2 +- | ||
| extensions-core/kubernetes-extensions/pom.xml | 2 +- | ||
| extensions-core/orc-extensions/pom.xml | 2 +- | ||
| extensions-core/parquet-extensions/pom.xml | 2 +- | ||
| pom.xml | 31 ++++++++++--------- | ||
| pom.xml | 24 ++++++++++++------- | ||
| processing/pom.xml | 2 +- | ||
| 6 files changed, 22 insertions(+), 19 deletions(-) | ||
| 5 files changed, 19 insertions(+), 13 deletions(-) | ||
|
|
||
| diff --git a/extensions-core/druid-pac4j/pom.xml b/extensions-core/druid-pac4j/pom.xml | ||
| index 3693d28d67..8be5e4c355 100644 | ||
| index 8e742e5f17..f5836cb8a4 100644 | ||
| --- a/extensions-core/druid-pac4j/pom.xml | ||
| +++ b/extensions-core/druid-pac4j/pom.xml | ||
| @@ -34,7 +34,7 @@ | ||
|
|
@@ -26,7 +25,7 @@ index 3693d28d67..8be5e4c355 100644 | |
| <!-- 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--> | ||
| <nimbus.lang.tag.version>1.7</nimbus.lang.tag.version> | ||
| diff --git a/extensions-core/kubernetes-extensions/pom.xml b/extensions-core/kubernetes-extensions/pom.xml | ||
| index 1e513ec8eb..7f43fdd108 100644 | ||
| index 9e9ddfd458..1ef515a68f 100644 | ||
| --- a/extensions-core/kubernetes-extensions/pom.xml | ||
| +++ b/extensions-core/kubernetes-extensions/pom.xml | ||
| @@ -34,7 +34,7 @@ | ||
|
|
@@ -39,7 +38,7 @@ index 1e513ec8eb..7f43fdd108 100644 | |
|
|
||
|
|
||
| diff --git a/extensions-core/orc-extensions/pom.xml b/extensions-core/orc-extensions/pom.xml | ||
| index 1b6a394728..bb4a9be716 100644 | ||
| index 656f34134f..376337f009 100644 | ||
| --- a/extensions-core/orc-extensions/pom.xml | ||
| +++ b/extensions-core/orc-extensions/pom.xml | ||
| @@ -31,7 +31,7 @@ | ||
|
|
@@ -51,93 +50,80 @@ index 1b6a394728..bb4a9be716 100644 | |
| </properties> | ||
| <dependencies> | ||
| <dependency> | ||
| diff --git a/extensions-core/parquet-extensions/pom.xml b/extensions-core/parquet-extensions/pom.xml | ||
| index 0d18d9162d..a8f9e7d52e 100644 | ||
| --- a/extensions-core/parquet-extensions/pom.xml | ||
| +++ b/extensions-core/parquet-extensions/pom.xml | ||
| @@ -201,7 +201,7 @@ | ||
| </dependency> | ||
| </dependencies> | ||
| <properties> | ||
| - <parquet.version>1.13.0</parquet.version> | ||
| + <parquet.version>1.13.1</parquet.version> | ||
| </properties> | ||
| </profile> | ||
| </profiles> | ||
| diff --git a/pom.xml b/pom.xml | ||
| index e9e19f7920..4408e55b9c 100644 | ||
| index 369550e166..ae6f8f9c15 100644 | ||
| --- a/pom.xml | ||
| +++ b/pom.xml | ||
| @@ -74,7 +74,7 @@ | ||
| <maven.compiler.target>1.8</maven.compiler.target> | ||
| <java.version>8</java.version> | ||
| @@ -73,7 +73,7 @@ | ||
| <java.version>11</java.version> | ||
| <maven.compiler.release>${java.version}</maven.compiler.release> | ||
| <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding> | ||
| - <aether.version>0.9.0.M2</aether.version> | ||
| + <aether.version>0.9.1.v20140329</aether.version> | ||
| <apache.curator.version>5.5.0</apache.curator.version> | ||
| <apache.kafka.version>3.9.0</apache.kafka.version> | ||
| <apache.curator.version>5.8.0</apache.curator.version> | ||
| <apache.kafka.version>3.9.1</apache.kafka.version> | ||
| <!-- when updating apache ranger, verify the usage of aws-bundle-sdk vs aws-logs-sdk | ||
| @@ -90,24 +90,27 @@ | ||
| <calcite.version>1.37.0</calcite.version> | ||
| <confluent.version>6.2.12</confluent.version> | ||
| @@ -90,11 +90,14 @@ | ||
| <confluent.version>6.2.15</confluent.version> | ||
| <cronutils.version>9.2.0</cronutils.version> | ||
| <datasketches.version>4.2.0</datasketches.version> | ||
| - <datasketches.memory.version>2.2.0</datasketches.memory.version> | ||
| + <datasketches.memory.version>2.2.1</datasketches.memory.version> | ||
| <derby.version>10.14.2.0</derby.version> | ||
| - <dropwizard.metrics.version>4.2.22</dropwizard.metrics.version> | ||
| + <dropwizard.metrics.version>4.2.30</dropwizard.metrics.version> | ||
| <errorprone.version>2.20.0</errorprone.version> | ||
| <errorprone.version>2.35.1</errorprone.version> | ||
| - <fastutil.version>8.5.4</fastutil.version> | ||
| + <!-- An additional null check was introduced in fastutils 8.5.7 that breaks data ingestion tasks: | ||
| + https://github.com/stackabletech/druid-operator/issues/595 | ||
| + https://github.com/vigna/fastutil/commit/598a4fd064e193be69ea324aa86947477c82ede8 --> | ||
| + <fastutil.version>8.5.6</fastutil.version> | ||
| <guava.version>32.0.1-jre</guava.version> | ||
| <guice.version>4.1.0</guice.version> | ||
| <guava.version>32.1.3-jre</guava.version> | ||
| <guice.version>5.1.0</guice.version> | ||
| <hamcrest.version>1.3</hamcrest.version> | ||
| - <jetty.version>9.4.56.v20240826</jetty.version> | ||
| + <jetty.version>9.4.57.v20241219</jetty.version> | ||
| @@ -102,13 +105,13 @@ | ||
| <jersey.version>1.19.4</jersey.version> | ||
| - <jackson.version>2.12.7.20221012</jackson.version> | ||
| <jackson.core.version>2.18.4.1</jackson.core.version> | ||
| <jackson.version>2.18.4</jackson.version> | ||
| - <codehaus.jackson.version>1.9.13</codehaus.jackson.version> | ||
| + <jackson.version>2.12.7.20240502</jackson.version> | ||
| + <codehaus.jackson.version>1.9.14-MULE-002</codehaus.jackson.version> | ||
| <log4j.version>2.22.1</log4j.version> | ||
| <mysql.version>8.2.0</mysql.version> | ||
| <mariadb.version>2.7.3</mariadb.version> | ||
| <netty3.version>3.10.6.Final</netty3.version> | ||
| - <netty4.version>4.1.108.Final</netty4.version> | ||
| <netty4.version>4.1.122.Final</netty4.version> | ||
| - <postgresql.version>42.7.2</postgresql.version> | ||
| + <netty4.version>4.1.117.Final</netty4.version> | ||
| + <postgresql.version>42.7.5</postgresql.version> | ||
| <protobuf.version>3.25.5</protobuf.version> | ||
| <resilience4j.version>1.3.1</resilience4j.version> | ||
| <slf4j.version>1.7.36</slf4j.version> | ||
| @@ -118,17 +121,17 @@ | ||
| <!-- mockito-inline artifact was removed in mockito 5.3 (mockito 5.x is required for Java >17), | ||
| 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) --> | ||
| <mockito.inline.artifact>core</mockito.inline.artifact> | ||
| - <aws.sdk.version>1.12.638</aws.sdk.version> | ||
| <slf4j.version>2.0.16</slf4j.version> | ||
| @@ -117,18 +120,21 @@ | ||
| <hadoop.compile.version>3.3.6</hadoop.compile.version> | ||
| <graaljs.version>22.3.5</graaljs.version> | ||
| <mockito.version>5.14.2</mockito.version> | ||
| + <!-- mockito-inline artifact was removed in mockito 5.3 (mockito 5.x is required for Java >17), | ||
| + 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) --> | ||
| + <mockito.inline.artifact>core</mockito.inline.artifact> | ||
| <aws.sdk.version>1.12.784</aws.sdk.version> | ||
| - <caffeine.version>2.8.0</caffeine.version> | ||
| - <jacoco.version>0.8.7</jacoco.version> | ||
| + <aws.sdk.version>1.12.780</aws.sdk.version> | ||
| + <caffeine.version>2.8.8</caffeine.version> | ||
| + <jacoco.version>0.8.12</jacoco.version> | ||
| <jacoco.version>0.8.12</jacoco.version> | ||
| <testcontainers.version>1.21.3</testcontainers.version> | ||
| <hibernate-validator.version>6.2.5.Final</hibernate-validator.version> | ||
| - <httpclient.version>4.5.13</httpclient.version> | ||
| + <httpclient.version>4.5.14</httpclient.version> | ||
| <!-- When upgrading ZK, edit docs and integration tests as well (integration-tests/docker-base/setup.sh) --> | ||
| <zookeeper.version>3.8.4</zookeeper.version> | ||
| <checkerframework.version>2.5.7</checkerframework.version> | ||
| <checkerframework.version>3.48.1</checkerframework.version> | ||
| <com.google.apis.client.version>2.2.0</com.google.apis.client.version> | ||
| <com.google.http.client.apis.version>1.42.3</com.google.http.client.apis.version> | ||
| - <com.google.apis.compute.version>v1-rev20230606-2.0.0</com.google.apis.compute.version> | ||
| + <com.google.apis.compute.version>v1-rev20250107-2.0.0</com.google.apis.compute.version> | ||
| <com.google.cloud.storage.version>2.29.1</com.google.cloud.storage.version> | ||
| <jdk.strong.encapsulation.argLine><!-- empty placeholder --></jdk.strong.encapsulation.argLine> | ||
| <jdk.security.manager.allow.argLine><!-- empty placeholder --></jdk.security.manager.allow.argLine> | ||
| <jdk.strong.encapsulation.argLine> | ||
| <!-- Strong encapsulation parameters --> | ||
| diff --git a/processing/pom.xml b/processing/pom.xml | ||
| index d5418dce93..716c1299f4 100644 | ||
| index 05232d48c1..a10f42d189 100644 | ||
| --- a/processing/pom.xml | ||
| +++ b/processing/pom.xml | ||
| @@ -36,7 +36,7 @@ | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.