This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch CAMEL-18068
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f313e74dedefe27d249def9999655f44cf4c50c4
Author: Babak Vahdat <bvah...@apache.org>
AuthorDate: Fri May 6 14:06:58 2022 +0200
CAMEL-18068: upgrade to com.azure:azure-sdk-bom:1.2.1
---
camel-dependencies/pom.xml | 20 ++++++++++----------
.../component/azure/cosmosdb/CosmosDbComponent.java | 2 --
.../eventhubs/client/EventHubsClientFactory.java | 6 +++---
.../camel-azure/camel-azure-storage-blob/pom.xml | 2 +-
.../datalake/operations/DataLakeFileOperations.java | 2 +-
.../datalake/component/DataLakeComponentTest.java | 3 +--
.../integration/DataLakeFileOperationIT.java | 2 +-
parent/pom.xml | 20 ++++++++++----------
8 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 784836ba363..68ba3e982b3 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -66,17 +66,17 @@
<aws-java-sdk2-version>2.17.185</aws-java-sdk2-version>
<aws-xray-version>2.6.1</aws-xray-version>
<axiom-version>1.2.14</axiom-version>
- <azure-cosmos-version>4.26.0</azure-cosmos-version>
- <azure-eventhubs-version>5.11.0</azure-eventhubs-version>
- <azure-identity-version>1.4.0</azure-identity-version>
+ <azure-cosmos-version>4.28.1</azure-cosmos-version>
+ <azure-eventhubs-version>5.11.2</azure-eventhubs-version>
+ <azure-identity-version>1.5.0</azure-identity-version>
<azure-jackson2-version>2.13.2</azure-jackson2-version>
- <azure-keyvault-secrets-version>4.3.8</azure-keyvault-secrets-version>
-
<azure-messaging-eventhubs-checkpointstore-blob-version>1.10.1</azure-messaging-eventhubs-checkpointstore-blob-version>
-
<azure-messaging-servicebus-version>7.4.2</azure-messaging-servicebus-version>
-
<azure-storage-blob-changedfeed-version>12.0.0-beta.10</azure-storage-blob-changedfeed-version>
- <azure-storage-blob-version>12.14.4</azure-storage-blob-version>
- <azure-storage-datalake-version>12.7.1</azure-storage-datalake-version>
- <azure-storage-queue-version>12.11.4</azure-storage-queue-version>
+ <azure-keyvault-secrets-version>4.4.1</azure-keyvault-secrets-version>
+
<azure-messaging-eventhubs-checkpointstore-blob-version>1.12.1</azure-messaging-eventhubs-checkpointstore-blob-version>
+
<azure-messaging-servicebus-version>7.8.0</azure-messaging-servicebus-version>
+
<azure-storage-blob-changefeed-version>12.0.0-beta.17</azure-storage-blob-changefeed-version>
+ <azure-storage-blob-version>12.16.0</azure-storage-blob-version>
+ <azure-storage-datalake-version>12.9.0</azure-storage-datalake-version>
+ <azure-storage-queue-version>12.12.1</azure-storage-queue-version>
<bouncycastle-version>1.70</bouncycastle-version>
<box-java-sdk-version>2.58.0</box-java-sdk-version>
<braintree-gateway-version>3.15.0</braintree-gateway-version>
diff --git
a/components/camel-azure/camel-azure-cosmosdb/src/main/java/org/apache/camel/component/azure/cosmosdb/CosmosDbComponent.java
b/components/camel-azure/camel-azure-cosmosdb/src/main/java/org/apache/camel/component/azure/cosmosdb/CosmosDbComponent.java
index 89bc98cc995..8a020216ad7 100644
---
a/components/camel-azure/camel-azure-cosmosdb/src/main/java/org/apache/camel/component/azure/cosmosdb/CosmosDbComponent.java
+++
b/components/camel-azure/camel-azure-cosmosdb/src/main/java/org/apache/camel/component/azure/cosmosdb/CosmosDbComponent.java
@@ -33,8 +33,6 @@ import org.slf4j.LoggerFactory;
@Component("azure-cosmosdb")
public class CosmosDbComponent extends DefaultComponent {
- private static final Logger LOG =
LoggerFactory.getLogger(CosmosDbComponent.class);
-
@Metadata
private CosmosDbConfiguration configuration = new CosmosDbConfiguration();
diff --git
a/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/client/EventHubsClientFactory.java
b/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/client/EventHubsClientFactory.java
index 89f1c6cdb7e..cb1a2ce84aa 100644
---
a/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/client/EventHubsClientFactory.java
+++
b/components/camel-azure/camel-azure-eventhubs/src/main/java/org/apache/camel/component/azure/eventhubs/client/EventHubsClientFactory.java
@@ -46,7 +46,7 @@ public final class EventHubsClientFactory {
return new EventHubClientBuilder()
.connectionString(buildConnectionString(configuration))
.transportType(configuration.getAmqpTransportType())
- .retry(configuration.getAmqpRetryOptions())
+ .retryOptions(configuration.getAmqpRetryOptions())
.buildAsyncProducerClient();
}
@@ -56,7 +56,7 @@ public final class EventHubsClientFactory {
.consumerGroup(configuration.getConsumerGroupName())
.prefetchCount(configuration.getPrefetchCount())
.transportType(configuration.getAmqpTransportType())
- .retry(configuration.getAmqpRetryOptions())
+ .retryOptions(configuration.getAmqpRetryOptions())
.buildAsyncConsumerClient();
}
@@ -68,7 +68,7 @@ public final class EventHubsClientFactory {
.connectionString(buildConnectionString(configuration))
.checkpointStore(createCheckpointStore(configuration))
.consumerGroup(configuration.getConsumerGroupName())
- .retry(configuration.getAmqpRetryOptions())
+ .retryOptions(configuration.getAmqpRetryOptions())
.transportType(configuration.getAmqpTransportType())
.processError(processError)
.processEvent(processEvent)
diff --git a/components/camel-azure/camel-azure-storage-blob/pom.xml
b/components/camel-azure/camel-azure-storage-blob/pom.xml
index cefa3923dcf..23b1b28c5f6 100644
--- a/components/camel-azure/camel-azure-storage-blob/pom.xml
+++ b/components/camel-azure/camel-azure-storage-blob/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob-changefeed</artifactId>
- <version>${azure-storage-blob-changedfeed-version}</version>
+ <version>${azure-storage-blob-changefeed-version}</version>
</dependency>
<dependency>
diff --git
a/components/camel-azure/camel-azure-storage-datalake/src/main/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileOperations.java
b/components/camel-azure/camel-azure-storage-datalake/src/main/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileOperations.java
index 9c3550dc36c..d34b036cc2e 100644
---
a/components/camel-azure/camel-azure-storage-datalake/src/main/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileOperations.java
+++
b/components/camel-azure/camel-azure-storage-datalake/src/main/java/org/apache/camel/component/azure/storage/datalake/operations/DataLakeFileOperations.java
@@ -199,7 +199,7 @@ public class DataLakeFileOperations {
final String umask = configurationProxy.getUmask(exchange);
final FileParallelUploadOptions uploadOptions
- = new
FileParallelUploadOptions(fileStreamAndLength.getInputStream(),
fileStreamAndLength.getStreamLength())
+ = new
FileParallelUploadOptions(fileStreamAndLength.getInputStream())
.setHeaders(commonRequestOptions.getPathHttpHeaders()).setParallelTransferOptions(transferOptions)
.setMetadata(commonRequestOptions.getMetadata()).setPermissions(permission)
.setRequestConditions(commonRequestOptions.getRequestConditions())
diff --git
a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/component/DataLakeComponentTest.java
b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/component/DataLakeComponentTest.java
index 2cd32685146..84d73919f43 100644
---
a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/component/DataLakeComponentTest.java
+++
b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/component/DataLakeComponentTest.java
@@ -80,7 +80,6 @@ class DataLakeComponentTest extends CamelTestSupport {
}
private StorageSharedKeyCredential storageSharedKeyCredentials() {
- final String accountKey = "";
- return new StorageSharedKeyCredential("cameltesting", accountKey);
+ return new StorageSharedKeyCredential("cameltesting", "myAccountKey");
}
}
diff --git
a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/integration/DataLakeFileOperationIT.java
b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/integration/DataLakeFileOperationIT.java
index 28ef40352da..23588bd0aa0 100644
---
a/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/integration/DataLakeFileOperationIT.java
+++
b/components/camel-azure/camel-azure-storage-datalake/src/test/java/org/apache/camel/component/azure/storage/datalake/integration/DataLakeFileOperationIT.java
@@ -61,7 +61,7 @@ public class DataLakeFileOperationIT extends Base {
final InputStream inputStream = new
ByteArrayInputStream("testing".getBytes(Charset.defaultCharset()));
final FileParallelUploadOptions options
- = new FileParallelUploadOptions(inputStream,
DataLakeUtils.getInputStreamLength(inputStream));
+ = new FileParallelUploadOptions(inputStream);
fileSystemClientWrapper.getDataLakeFileClientWrapper(randomFileName).uploadWithResponse(options,
null);
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 391b12973bc..a15faf3d100 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -84,16 +84,16 @@
<aws-xray-version>2.6.1</aws-xray-version>
<axiom-version>1.2.14</axiom-version>
<azure-jackson2-version>2.13.2</azure-jackson2-version>
- <azure-cosmos-version>4.26.0</azure-cosmos-version>
- <azure-eventhubs-version>5.11.0</azure-eventhubs-version>
- <azure-identity-version>1.4.0</azure-identity-version>
- <azure-keyvault-secrets-version>4.3.8</azure-keyvault-secrets-version>
-
<azure-messaging-eventhubs-checkpointstore-blob-version>1.10.1</azure-messaging-eventhubs-checkpointstore-blob-version>
-
<azure-messaging-servicebus-version>7.4.2</azure-messaging-servicebus-version>
- <azure-storage-blob-version>12.14.4</azure-storage-blob-version>
-
<azure-storage-blob-changedfeed-version>12.0.0-beta.10</azure-storage-blob-changedfeed-version>
- <azure-storage-datalake-version>12.7.1</azure-storage-datalake-version>
- <azure-storage-queue-version>12.11.4</azure-storage-queue-version>
+ <azure-cosmos-version>4.28.1</azure-cosmos-version>
+ <azure-eventhubs-version>5.11.2</azure-eventhubs-version>
+ <azure-identity-version>1.5.0</azure-identity-version>
+ <azure-keyvault-secrets-version>4.4.1</azure-keyvault-secrets-version>
+
<azure-messaging-eventhubs-checkpointstore-blob-version>1.12.1</azure-messaging-eventhubs-checkpointstore-blob-version>
+
<azure-messaging-servicebus-version>7.8.0</azure-messaging-servicebus-version>
+ <azure-storage-blob-version>12.16.0</azure-storage-blob-version>
+
<azure-storage-blob-changefeed-version>12.0.0-beta.17</azure-storage-blob-changefeed-version>
+ <azure-storage-datalake-version>12.9.0</azure-storage-datalake-version>
+ <azure-storage-queue-version>12.12.1</azure-storage-queue-version>
<bouncycastle-version>1.70</bouncycastle-version>
<box-java-sdk-version>2.58.0</box-java-sdk-version>
<braintree-gateway-version>3.15.0</braintree-gateway-version>
