Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Peter Turcsanyi 2021-09-29 17:23:05 +02:00 committed by Pierre Villard
parent 51c6910510
commit 1e2783ba63
No known key found for this signature in database
GPG Key ID: F92A93B30C07C6D5
4 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml
View File

@ -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>
@ -46,17 +45,6 @@
<artifactId>microsoft-graph</artifactId>
<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>

7
nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
View File

@ -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>

3
nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITPutAzureDataLakeStorage.java
View File

@ -301,8 +301,9 @@ public class ITPutAzureDataLakeStorage extends AbstractAzureDataLakeStorageIT {
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);

10
nifi-nar-bundles/nifi-azure-bundle/pom.xml
View File

@ -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>