From cb5debc6ddaf59813f0a1c6ed6a996cc76eaa200 Mon Sep 17 00:00:00 2001
From: Pierre Villard <pierre.villard.fr@gmail.com>
Date: Fri, 7 Apr 2023 18:16:29 +0300
Subject: [PATCH] NIFI-11407 Upgraded Azure BOM from 1.2.9 to 1.2.11

- Added Woodstox Core to nifi-toolkit-encrypt-config

This closes #7136

Signed-off-by: David Handermann <exceptionfactory@apache.org>
(cherry picked from commit a148b6f348ad4d7fd30dc7219d3e450550bc0e78)
---
 nifi-commons/nifi-property-protection-azure/pom.xml | 2 +-
 nifi-nar-bundles/nifi-azure-bundle/pom.xml          | 4 ++--
 nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml    | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/nifi-commons/nifi-property-protection-azure/pom.xml b/nifi-commons/nifi-property-protection-azure/pom.xml
index 438e1c32fb..611e9354e3 100644
--- a/nifi-commons/nifi-property-protection-azure/pom.xml
+++ b/nifi-commons/nifi-property-protection-azure/pom.xml
@@ -26,7 +26,7 @@
             <dependency>
                 <groupId>com.azure</groupId>
                 <artifactId>azure-sdk-bom</artifactId>
-                <version>1.2.9</version>
+                <version>1.2.11</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
index 3b75af1a2b..325314305b 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
@@ -26,9 +26,9 @@
     <packaging>pom</packaging>
 
     <properties>
-        <azure.sdk.bom.version>1.2.9</azure.sdk.bom.version>
+        <azure.sdk.bom.version>1.2.11</azure.sdk.bom.version>
         <microsoft.azure-storage.version>8.6.6</microsoft.azure-storage.version>
-        <msal4j.version>1.13.3</msal4j.version>
+        <msal4j.version>1.13.7</msal4j.version>
         <qpid.proton.version>0.34.1</qpid.proton.version>
     </properties>
 
diff --git a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
index af40989c4a..0aedac66c8 100644
--- a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
@@ -120,6 +120,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- Woodstox provides optimized XML processing over standard JRE capabilities -->
+        <dependency>
+            <groupId>com.fasterxml.woodstox</groupId>
+            <artifactId>woodstox-core</artifactId>
+            <version>6.5.0</version>
+        </dependency>
         <dependency>
             <groupId>org.spockframework</groupId>
             <artifactId>spock-core</artifactId>