From daad0720b1a10cb21dcd5c4f0e9672b5a4bc5b02 Mon Sep 17 00:00:00 2001
From: exceptionfactory <exceptionfactory@apache.org>
Date: Tue, 26 Mar 2024 12:01:14 -0500
Subject: [PATCH] NIFI-12957 Upgraded Azure SDK BOM from 1.2.19 to 1.2.21

- Upgraded MSAL4J from 1.14.2 to 1.14.3

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #8571.
---
 .../nifi-property-protection-azure/pom.xml         | 14 +++++++-------
 nifi-nar-bundles/nifi-azure-bundle/pom.xml         | 10 ++--------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/nifi-commons/nifi-property-protection-azure/pom.xml b/nifi-commons/nifi-property-protection-azure/pom.xml
index c641939d4d..21a4919437 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.19</version>
+                <version>1.2.21</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -85,15 +85,15 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- Override oauth2-oidc-sdk 9.35 from msal4j -->
-        <dependency>
-            <groupId>com.nimbusds</groupId>
-            <artifactId>oauth2-oidc-sdk</artifactId>
-            <version>9.43.3</version>
-        </dependency>
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-core-http-okhttp</artifactId>
         </dependency>
+        <!-- Override MSAL4J 1.14.0 from azure-identity -->
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>msal4j</artifactId>
+            <version>1.14.3</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
index 1353d479f6..ddaae43bb5 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
@@ -27,8 +27,8 @@
     <packaging>pom</packaging>
 
     <properties>
-        <azure.sdk.bom.version>1.2.19</azure.sdk.bom.version>
-        <msal4j.version>1.14.2</msal4j.version>
+        <azure.sdk.bom.version>1.2.21</azure.sdk.bom.version>
+        <msal4j.version>1.14.3</msal4j.version>
         <qpid.proton.version>0.34.1</qpid.proton.version>
     </properties>
 
@@ -68,12 +68,6 @@
                 <artifactId>nimbus-jose-jwt</artifactId>
                 <version>9.37.3</version>
             </dependency>
-            <!-- Override Reactor Netty client 1.0.34 from Azure Identity -->
-            <dependency>
-                <groupId>io.projectreactor.netty</groupId>
-                <artifactId>reactor-netty-http</artifactId>
-                <version>1.0.39</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>