Merge branch 'main' into chore/hbase-phoenix-omid-1076

Author: razvan

CHANGELOG.md

@@ -23,6 +23,8 @@ All notable changes to this project will be documented in this file.
   `check-permissions-ownership.sh` provided in stackable-base image ([#1041]).
 - nifi: check for correct permissions and ownerships in /stackable folder via
   `check-permissions-ownership.sh` provided in stackable-base image ([#1027]).
+- nifi: Add [nifi-iceberg-bundle] for NiFi `2.4.0` ([#1060], [#1106]).
+- nifi: Add `2.4.0` ([#1114]).
 - opa: check for correct permissions and ownerships in /stackable folder via
   `check-permissions-ownership.sh` provided in stackable-base image ([#1038]).
 - opa: Add `1.4.2` ([#1103]).
@@ -35,7 +37,6 @@ All notable changes to this project will be documented in this file.
   `check-permissions-ownership.sh` provided in stackable-base image ([#1025]).
 - zookeeper: check for correct permissions and ownerships in /stackable folder via
   `check-permissions-ownership.sh` provided in stackable-base image ([#1043]).
-- nifi: Add [nifi-iceberg-bundle](https://github.com/stackabletech/nifi-iceberg-bundle) for NiFi `2.2.0` ([#1060], [#1106]).
 - java: Add JDK 24 ([#1097]).
 - ci: Add golang image to mirror workflow ([#1103]).
 - hbase: add 2.6.2 and upgrade dependencies ([#1101])
@@ -83,7 +84,9 @@ All notable changes to this project will be documented in this file.
 - opa: Remove legacy bundle-builder from container build ([#1103]).
 - hbase: Remove 2.4.18 ([#1101])
 - druid: Remove `30.0.0` ([#1110]).
+- nifi: Remove `2.2.0` ([#1114]).
 
+[nifi-iceberg-bundle]: https://github.com/stackabletech/nifi-iceberg-bundle
 [#1025]: https://github.com/stackabletech/docker-images/pull/1025
 [#1027]: https://github.com/stackabletech/docker-images/pull/1027
 [#1028]: https://github.com/stackabletech/docker-images/pull/1028
@@ -115,6 +118,7 @@ All notable changes to this project will be documented in this file.
 [#1106]: https://github.com/stackabletech/docker-images/pull/1106
 [#1108]: https://github.com/stackabletech/docker-images/pull/1108
 [#1110]: https://github.com/stackabletech/docker-images/pull/1110
+[#1114]: https://github.com/stackabletech/docker-images/pull/1114
 [#1116]: https://github.com/stackabletech/docker-images/pull/1116
 
 ## [25.3.0] - 2025-03-21

nifi/Dockerfile

@@ -81,6 +81,8 @@ if [[ "${PRODUCT}" != 1.* ]] ; then
     curl "https://github.com/stackabletech/nifi-iceberg-bundle/archive/refs/tags/${NIFI_ICEBERG_BUNDLE}.tar.gz" | tar -xzC .
     cd nifi-iceberg-bundle-${NIFI_ICEBERG_BUNDLE} || exit
 
+    sed -i -e "s/{{ NIFI_VERSION }}/${PRODUCT}/g" pom.xml
+
     mvn \
         --batch-mode \
         --no-transfer-progress\

nifi/stackable/patches/2.2.0/0002-Allow-bypassing-check-for-host-header.patch

@@ -1,14 +1,14 @@
-From 450dee471deaad0d154cc722b11054ba5fa3a084 Mon Sep 17 00:00:00 2001
-From: Malte Sander <malte.sander.it@gmail.com>
-Date: Fri, 17 May 2024 15:38:33 +0200
-Subject: Disable zip assembly to save disk space
+From cef2caa1141df8974ff853ce3bf55736cc22af4f Mon Sep 17 00:00:00 2001
+From: Nick Larsen <nick.larsen@stackable.tech>
+Date: Mon, 17 Feb 2025 17:26:20 +0100
+Subject: no zip assembly
 
 ---
  nifi-assembly/pom.xml | 1 -
  1 file changed, 1 deletion(-)
 
 diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
-index c04e1c8650..adcecd6206 100644
+index 41bab2ad37..4ebb494613 100644
 --- a/nifi-assembly/pom.xml
 +++ b/nifi-assembly/pom.xml
 @@ -66,7 +66,6 @@ language governing permissions and limitations under the License. -->

…le-zip-assembly-to-save-disk-space.patch …patches/2.4.0/0001-no-zip-assembly.patchnifi/stackable/patches/2.2.0/0001-Disable-zip-assembly-to-save-disk-space.patch renamed to nifi/stackable/patches/2.4.0/0001-no-zip-assembly.patch nifi/stackable/patches/2.2.0/0001-Disable-zip-assembly-to-save-disk-space.patch renamed to nifi/stackable/patches/2.4.0/0001-no-zip-assembly.patch

@@ -1,17 +1,17 @@
-From 5fb37840eb45dc2b159089e75e2d0ef3054ac03d Mon Sep 17 00:00:00 2001
-From: Lukas Voetmand <lukas.voetmand@stackable.tech>
-Date: Fri, 6 Sep 2024 17:53:52 +0200
-Subject: Add CycloneDX plugin
+From a9fc3a2eea5add80ca03e8fba97d83d2952f2e5d Mon Sep 17 00:00:00 2001
+From: Nick Larsen <nick.larsen@stackable.tech>
+Date: Mon, 17 Feb 2025 17:31:17 +0100
+Subject: add cyclonedx plugin
 
 ---
  pom.xml | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
 diff --git a/pom.xml b/pom.xml
-index 7885e6c208..07e03e66cd 100644
+index 78f53a9aab..fdcc97cd51 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1007,6 +1007,24 @@
+@@ -1013,6 +1013,24 @@
                      </rulesets>
                  </configuration>
              </plugin>

…es/2.2.0/0003-Add-CycloneDX-plugin.patch …es/2.4.0/0002-add-cyclonedx-plugin.patchnifi/stackable/patches/2.2.0/0003-Add-CycloneDX-plugin.patch renamed to nifi/stackable/patches/2.4.0/0002-add-cyclonedx-plugin.patch nifi/stackable/patches/2.2.0/0003-Add-CycloneDX-plugin.patch renamed to nifi/stackable/patches/2.4.0/0002-add-cyclonedx-plugin.patch

@@ -1,2 +1,2 @@
-base = "b33ffac8aa10992482f7fa54e6cfccc46a5e8e27"
 mirror = "https://github.com/stackabletech/nifi.git"
+base = "65c7732e46cdfcb17afe0dd7b0a3e0956226bcbb"

…i/stackable/patches/2.2.0/patchable.toml …i/stackable/patches/2.4.0/patchable.tomlnifi/stackable/patches/2.2.0/patchable.toml renamed to nifi/stackable/patches/2.4.0/patchable.toml nifi/stackable/patches/2.2.0/patchable.toml renamed to nifi/stackable/patches/2.4.0/patchable.toml

@@ -10,9 +10,9 @@
         "java-devel": "11",
     },
     {
-        "product": "2.2.0",
+        "product": "2.4.0",
         "java-base": "21",
         "java-devel": "21",
-        "nifi_iceberg_bundle": "0.0.3",
+        "nifi_iceberg_bundle": "0.0.4",
     },
 ]