NIFI-9305: Upgraded Azure dependencies
Also fixed ITPutAzureDataLakeStorage (was broken due to a former dependency upgrade).
Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>
This closes #5472.
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml
index f54972c..b6c9e06 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml
@@ -24,7 +24,6 @@
<packaging>jar</packaging>
<properties>
<microsoft-graph.version>2.10.0</microsoft-graph.version>
- <msal4j.version>1.6.0</msal4j.version>
</properties>
<dependencies>
<dependency>
@@ -47,17 +46,6 @@
<version>${microsoft-graph.version}</version>
</dependency>
<dependency>
- <groupId>com.azure</groupId>
- <artifactId>azure-identity</artifactId>
- <version>${azure.identity.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.azure</groupId>
- <artifactId>azure-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>msal4j</artifactId>
<version>${msal4j.version}</version>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
index 99d30e2..5acc374 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
@@ -20,9 +20,10 @@
<artifactId>nifi-azure-processors</artifactId>
<packaging>jar</packaging>
<properties>
- <azure-eventhubs.version>3.2.1</azure-eventhubs.version>
- <azure-eventhubs-eph.version>3.2.1</azure-eventhubs-eph.version>
+ <azure-eventhubs.version>3.3.0</azure-eventhubs.version>
+ <azure-eventhubs-eph.version>3.3.0</azure-eventhubs-eph.version>
<azure-keyvault.version>1.2.4</azure-keyvault.version>
+ <azure-storage-file-datalake.version>12.7.1</azure-storage-file-datalake.version>
</properties>
<dependencies>
<dependency>
@@ -133,7 +134,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-datalake</artifactId>
- <version>12.2.0</version>
+ <version>${azure-storage-file-datalake.version}</version>
<exclusions>
<exclusion>
<groupId>com.azure</groupId>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITPutAzureDataLakeStorage.java b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITPutAzureDataLakeStorage.java
index c0ecc15..fa68c5a 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITPutAzureDataLakeStorage.java
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITPutAzureDataLakeStorage.java
@@ -301,8 +301,9 @@
String urlEscapedDirectory = UrlEscapers.urlPathSegmentEscaper().escape(directory);
String urlEscapedFileName = UrlEscapers.urlPathSegmentEscaper().escape(fileName);
+ String urlEscapedPathSeparator = UrlEscapers.urlPathSegmentEscaper().escape("/");
String primaryUri = StringUtils.isNotEmpty(directory)
- ? String.format("https://%s.dfs.core.windows.net/%s/%s/%s", getAccountName(), fileSystemName, urlEscapedDirectory, urlEscapedFileName)
+ ? String.format("https://%s.dfs.core.windows.net/%s/%s%s%s", getAccountName(), fileSystemName, urlEscapedDirectory, urlEscapedPathSeparator, urlEscapedFileName)
: String.format("https://%s.dfs.core.windows.net/%s/%s", getAccountName(), fileSystemName, urlEscapedFileName);
flowFile.assertAttributeEquals(ATTR_NAME_PRIMARY_URI, primaryUri);
diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
index 7808fac..c259856 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
@@ -26,10 +26,12 @@
<packaging>pom</packaging>
<properties>
- <azure-storage.version>8.4.0</azure-storage.version>
- <azure.core.version>1.6.0</azure.core.version>
- <azure.identity.version>1.0.6</azure.identity.version>
- <azure-cosmos.version>4.2.0</azure-cosmos.version>
+ <azure-storage.version>8.6.6</azure-storage.version>
+ <azure.core.version>1.21.0</azure.core.version>
+ <azure.identity.version>1.4.0</azure.identity.version>
+ <!-- azure-identity depends on msal4j transitively, keep these versions consistent -->
+ <msal4j.version>1.11.0</msal4j.version>
+ <azure-cosmos.version>4.20.0</azure-cosmos.version>
</properties>
<modules>
