This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new de11b6c43e NIFI-13287: Added note to msal4j dependency in Azure
bundle's pom This closes #8869.
de11b6c43e is described below
commit de11b6c43e6d5ec9fc77088ca091c0b848e5de21
Author: Peter Turcsanyi <[email protected]>
AuthorDate: Thu May 9 20:37:33 2024 +0200
NIFI-13287: Added note to msal4j dependency in Azure bundle's pom
This closes #8869.
Signed-off-by: Joseph Witt <[email protected]>
---
.../nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml | 1 -
nifi-extension-bundles/nifi-azure-bundle/pom.xml | 9 ++++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml
index cd15f1891f..a70b317438 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml
@@ -53,7 +53,6 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>msal4j</artifactId>
- <version>${msal4j.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/nifi-extension-bundles/nifi-azure-bundle/pom.xml
b/nifi-extension-bundles/nifi-azure-bundle/pom.xml
index b55b83b603..e78152c5cc 100644
--- a/nifi-extension-bundles/nifi-azure-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-azure-bundle/pom.xml
@@ -27,6 +27,7 @@
<packaging>pom</packaging>
<properties>
+ <!-- when changing the Azure SDK version, also update msal4j to the
version that is required by azure-identity -->
<azure.sdk.bom.version>1.2.23</azure.sdk.bom.version>
<msal4j.version>1.15.0</msal4j.version>
<qpid.proton.version>0.34.1</qpid.proton.version>
@@ -62,7 +63,13 @@
<artifactId>proton-j</artifactId>
<version>${qpid.proton.version}</version>
</dependency>
- <!-- Override nimbus-jose-jwt 9.22 from msal4j -->
+ <!-- Set msal4j version for azure-identity and
nifi-azure-graph-authorizer -->
+ <dependency>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>msal4j</artifactId>
+ <version>${msal4j.version}</version>
+ </dependency>
+ <!-- Override nimbus-jose-jwt from msal4j -->
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
