Skip to content

Commit 9f505c4

Browse files
authored
Migrate existing patch series to patchable (#1005)
* Convert Druid 30.0.0 patches to patchable * Update a few dates for Druid 26.0.0 patches * Delete patches for unsupported Hadoop versions * Add patchable commands for getting the current patch and worktree dirs * More Druid date fixes * Make mailsplitting slightly more lenient * Migrate Hadoop 3.3.4 to patchable * Revise Hadoop 3.3.4 patch naming * Convert Hadoop 3.3.6 patches to Patchable * Make patchable discover images-repo specifically * Add metadata to Hadoop 3.4.0 patches * Convert Hadoop 3.4.0 to patchable * Hadoop 3.3.6 rewording * Convert HBase 2.4.18 to patchable * Convert HBase 2.6.0 to patchable * Convert HBase 2.6.1 to patchable * Convert Hive 3.1.3 to patchable * Convert Hive 4.0.0 to patchable * Convert Kafka 3.7.1 to patchable * Fix metadata for Kafka 3.7.2, 3.8.1, 3.9.0 patches * Convert omid to patchable * Convert spark-k8s to patchable * Convert Superset to patchable * Convert Trino to patchable * Convert trino-storage-connector to patchable * Convert Zookeeper to patchable * Changelog * Normalize git URLs * Convert NiFi 1.27.0 to patchable * Normalize patchable metadata for NiFi 1.28.1 and 2.2.0 * Remove duplicate subject tag from Druid 30.0.0 FMPP patch
1 parent 9d73fa3 commit 9f505c4

File tree

153 files changed

+1297
-2119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+1297
-2119
lines changed

.patchable

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Marker file for Patchable to know that this is the image repository

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ All notable changes to this project will be documented in this file.
2828
- trino-cli: Add version 470 ([#999]).
2929
- trino-storage-connector: Add version 470 ([#999]).
3030
- superset: Add version `4.1.1` ([#991]).
31-
- Add Patchable patch management tool ([#1003], [#1007]).
31+
- Add Patchable patch management tool ([#1003], [#1005], [#1007]).
3232
- nifi: Add 1.28.1, 2.2.0 ([#1006]).
3333

3434
### Changed
@@ -78,6 +78,7 @@ All notable changes to this project will be documented in this file.
7878
[#999]: https://github.com/stackabletech/docker-images/pull/999
7979
[#1000]: https://github.com/stackabletech/docker-images/pull/1000
8080
[#1003]: https://github.com/stackabletech/docker-images/pull/1003
81+
[#1005]: https://github.com/stackabletech/docker-images/pull/1005
8182
[#1006]: https://github.com/stackabletech/docker-images/pull/1006
8283
[#1007]: https://github.com/stackabletech/docker-images/pull/1007
8384

druid/stackable/patches/26.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From a8bec93ee6d0a4364676333168229aa0ec56657e Mon Sep 17 00:00:00 2001
1+
From 098e0333cb3977164c62ab0f29aafaf9b1ac6c7c Mon Sep 17 00:00:00 2001
22
From: Lars Francke <[email protected]>
3-
Date: Thu, 12 Dec 2024 17:59:17 +0100
3+
Date: Wed, 10 Jul 2024 17:07:13 +0200
44
Subject: Removes all traces of the druid ranger extension
55

66
---

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From c19288cd84492d76f924152f2d4f0d0fc0499ed6 Mon Sep 17 00:00:00 2001
1+
From cb547abec8bb002984bcb598c75f5031ea9513e1 Mon Sep 17 00:00:00 2001
22
From: Lars Francke <[email protected]>
3-
Date: Thu, 12 Dec 2024 17:59:17 +0100
3+
Date: Wed, 10 Jul 2024 17:07:13 +0200
44
Subject: Include Prometheus emitter in distribution
55

66
---

druid/stackable/patches/26.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 85cacbcc47c88a56acd60d91fbf0412040523c8d Mon Sep 17 00:00:00 2001
1+
From 2722e90c01f02f804f1030f6aa91d07638e5e0a3 Mon Sep 17 00:00:00 2001
22
From: Lars Francke <[email protected]>
33
Date: Thu, 12 Dec 2024 17:59:17 +0100
44
Subject: Stop building unused extensions.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 4229d1c0d096e10dce72929224a7b4c2284fb417 Mon Sep 17 00:00:00 2001
1+
From 6a6cd8806bffe6b8f5da14d0d9f9b75fb79ac3cd Mon Sep 17 00:00:00 2001
22
From: Lars Francke <[email protected]>
33
Date: Thu, 12 Dec 2024 17:59:17 +0100
44
Subject: Updates all dependencies that have a new patch release available.

druid/stackable/patches/26.0.0/0005-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 d55895a2525286a5198a3b327c3ce503bc852ead Mon Sep 17 00:00:00 2001
1+
From 1e4c0f607abfe1362941af5f53e04cd0b845f41f Mon Sep 17 00:00:00 2001
22
From: Lars Francke <[email protected]>
33
Date: Thu, 12 Dec 2024 17:59:17 +0100
44
Subject: Include jackson-dataformat-xml dependency.

druid/stackable/patches/26.0.0/0006-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 d1ae8732e2eee44abb5c831f5363c69e75e64a9a Mon Sep 17 00:00:00 2001
1+
From c7d74ad665618125e09f365bae0ecaa2876b6a87 Mon Sep 17 00:00:00 2001
22
From: Lars Francke <[email protected]>
33
Date: Thu, 12 Dec 2024 17:59:17 +0100
44
Subject: Stop building the tar.gz distribution.

druid/stackable/patches/26.0.0/0007-Update-CycloneDX-plugin.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From ff7d6a5ea07ea30653b47f6ef6844103a7ac3349 Mon Sep 17 00:00:00 2001
1+
From 56541040ce6a5c36d53fdda71316d2a7ab8245c0 Mon Sep 17 00:00:00 2001
22
From: Lukas Voetmand <[email protected]>
3-
Date: Thu, 12 Dec 2024 17:59:17 +0100
3+
Date: Fri, 6 Sep 2024 17:53:52 +0200
44
Subject: Update CycloneDX plugin
55

66
---

druid/stackable/patches/26.0.0/0008-Fix-CVE-2024-36114.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From bdd52ae32874b686d6ddfa3179f6af787444662f Mon Sep 17 00:00:00 2001
1+
From a8442f203b70216cd7b3ec9cefe8f7627fa0d7e2 Mon Sep 17 00:00:00 2001
22
From: Malte Sander <[email protected]>
33
Date: Thu, 12 Dec 2024 17:59:17 +0100
44
Subject: Fix CVE-2024-36114

0 commit comments

Comments
 (0)