chore(nifi): Replace 2.0.0 with 2.2.0

Author: NickLarsenNZ

nifi/stackable/patches/2.0.0/003-patch-cyclonedx-plugin.patch

@@ -1,5 +1,14 @@
+From afe4e4583747c2972d2590e9c1bd7de8b48aa300 Mon Sep 17 00:00:00 2001
+From: Nick Larsen <[email protected]>
+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 e980e507c6..cb19c89367 100644
+index c04e1c8650..adcecd6206 100644
 --- a/nifi-assembly/pom.xml
 +++ b/nifi-assembly/pom.xml
 @@ -66,7 +66,6 @@ language governing permissions and limitations under the License. -->

nifi/stackable/patches/2.0.0/004-CVE-2024-36114-bump-aircompressor-0-27.patch

@@ -1,4 +1,8 @@
-Subject: [PATCH] Allow bypassing check for host header.
+From f6888b73bf6c8b2889f8f7241cdce6714cd6a776 Mon Sep 17 00:00:00 2001
+From: Nick Larsen <[email protected]>
+Date: Mon, 17 Feb 2025 17:28:46 +0100
+Subject: allow bypassing check for host header
+
 NiFi has the configuration option 'nifi.web.proxy.host' which controls allowed
 values for the host header field in any incoming request for the web ui.
 
@@ -20,11 +24,9 @@ hostnames by just setting it to "*" and this will effectively bypass the hostnam
 This allows us to keep the default behavior in place for those users where it works and not remove
 security features, but also enables users to disable this check if they know what they are doing.
 ---
-Index: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
+ .../org/apache/nifi/web/server/HostHeaderHandler.java     | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
 diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java
 index 97337d63e2..12ce1d8646 100644
 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java

nifi/stackable/patches/2.0.0/001-NIFI-no-zip-assembly-2.0.0.patch renamed to nifi/stackable/patches/2.2.0/0001-no-zip-assembly.patch

@@ -0,0 +1,38 @@
+From fbf66d408aefd995a2ac4a2b213b25a12cb9e96c Mon Sep 17 00:00:00 2001
+From: Nick Larsen <[email protected]>
+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
+--- a/pom.xml
++++ b/pom.xml
+@@ -1007,6 +1007,24 @@
+                     </rulesets>
+                 </configuration>
+             </plugin>
++            <plugin>
++                <groupId>org.cyclonedx</groupId>
++                <artifactId>cyclonedx-maven-plugin</artifactId>
++                <version>2.8.0</version>
++                <configuration>
++                    <projectType>application</projectType>
++                    <schemaVersion>1.5</schemaVersion>
++                    <skipNotDeployed>false</skipNotDeployed>
++                </configuration>
++                <executions>
++                  <execution>
++                    <phase>package</phase>
++                    <goals>
++                      <goal>makeBom</goal>
++                    </goals>
++                  </execution>
++                </executions>
++            </plugin>
+         </plugins>
+     </build>
+     <profiles>

nifi/stackable/patches/2.0.0/002-NIFI-no-host-header-check-2.0.0.patch renamed to nifi/stackable/patches/2.2.0/0002-allow-bypassing-check-for-host-header.patch

@@ -0,0 +1,2 @@
+upstream = "https://github.com/apache/nifi"
+base = "b33ffac8aa10992482f7fa54e6cfccc46a5e8e27"

nifi/stackable/patches/2.2.0/0003-add-cyclonedx-plugin.patch

@@ -10,7 +10,7 @@
         "java-devel": "11",
     },
     {
-        "product": "2.0.0",
+        "product": "2.2.0",
         "java-base": "21",
         "java-devel": "21",
     },