Skip to content

Commit 4887b32

Browse files
committed
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 0d513fd commit 4887b32

10 files changed

Lines changed: 13 additions & 35 deletions

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From bd9e330c263c4934fdf1db5aab9ebaad052e96a1 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 51ce7563ea..c238ef8946 100644
11+
index 51ce7563ea..28dc3f6a5f 100644
1212
--- a/distribution/pom.xml
1313
+++ b/distribution/pom.xml
14-
@@ -457,5 +457,51 @@
14+
@@ -457,5 +457,50 @@
1515
</plugins>
1616
</build>
1717
</profile>
@@ -50,7 +50,6 @@ index 51ce7563ea..c238ef8946 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>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 62239df37ea08117560b9c57e5242bfe7fb8bdb2 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.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 63a7e2865e5d21eb0be7474287101e1fd66325e6 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.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 855139430282a4d12ffdad20d62ce9753a236b38 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.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 89b19164bcae17bc8f12794afcaa13aa8f14a6ed Mon Sep 17 00:00:00 2001
1+
From 29b11c3292df341dda8216587faa4972cb3000b8 Mon Sep 17 00:00:00 2001
22
From: Nick Larsen <nick.larsen@stackable.tech>
33
Date: Tue, 16 Jun 2026 13:18:46 +0200
44
Subject: Update CycloneDX plugin

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 289ac13b8e8b2f4b43b1db6b39a52b1df07cf260 Mon Sep 17 00:00:00 2001
1+
From 1f7599f16bc94cc52f99bfecdd39f884a0db0595 Mon Sep 17 00:00:00 2001
22
From: xeniape <xenia.fischer@stackable.tech>
33
Date: Tue, 23 Sep 2025 09:43:41 +0200
44
Subject: Update FMPP version

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 1f518eb907c67a2c2e4556f6797d0033add57cb2 Mon Sep 17 00:00:00 2001
1+
From a4e74eb3f5f48bea8afa5339cd538d5fa1c09571 Mon Sep 17 00:00:00 2001
22
From: Techassi <git@techassi.dev>
33
Date: Wed, 21 Jan 2026 11:32:20 +0100
44
Subject: Stop building the embedded integration tests

druid/stackable/patches/37.0.0/0009-feat-add-configurable-clientAuthenticationMethod-to-.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 4eb28b98f7def7350db05b1e14a92fc5de80af63 Mon Sep 17 00:00:00 2001
1+
From e62a557afea83057dcc7af541ecd255cc121c8f2 Mon Sep 17 00:00:00 2001
22
From: dervoeti <lukas.krug@stackable.tech>
33
Date: Thu, 5 Feb 2026 15:00:23 +0100
44
Subject: feat: add configurable clientAuthenticationMethod to druid-pac4j OIDC

druid/stackable/patches/37.0.0/0010-Update-dependencies.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 477341bc4afbd86383d4bbec6f615070dccd22b4 Mon Sep 17 00:00:00 2001
1+
From f4e7c8576580028dc410664bfbb80dd4e49a1136 Mon Sep 17 00:00:00 2001
22
From: Nick Larsen <nick.larsen@stackable.tech>
33
Date: Tue, 16 Jun 2026 15:16:51 +0200
44
Subject: Update dependencies

druid/stackable/patches/37.0.0/0011-Remove-no-default-hadoop-arg.patch

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

0 commit comments

Comments
 (0)