> On 3 Sep 2022, at 23:55, Babak Vahdat <babak.vah...@swissonline.ch.INVALID>
> wrote:
>
> It’s reverted.
>
Hi
Just for the record, even if this commit has been reverted we still had to fix
the same issue on the 3.18.x LTS branch as well, though in another way, to
avoid the same issue about “hanging tests" while running the integration test
of azure-eventhubs.
—
Babak
>> On 3 Sep 2022, at 15:51, Claus Ibsen <claus.ib...@gmail.com> wrote:
>>
>> -1
>>
>> Can we avoid doing this on a LTS release - there may be unforeseen issues
>> like last time we have azure BOM imported.
>> Lets introduce this in 3.19 onwards.
>>
>>
>>
>> On Sat, Sep 3, 2022 at 1:58 PM <bvah...@apache.org> wrote:
>>
>>> This is an automated email from the ASF dual-hosted git repository.
>>>
>>> bvahdat pushed a commit to branch camel-3.18.x
>>> in repository https://gitbox.apache.org/repos/asf/camel.git
>>>
>>>
>>> The following commit(s) were added to refs/heads/camel-3.18.x by this push:
>>> new 2a3013c02e2 CAMEL-18452: Integrate azure-sdk-bom in a
>>> non-conflicting manner
>>> 2a3013c02e2 is described below
>>>
>>> commit 2a3013c02e26a468f3df7c62403b63d6535c7e9d
>>> Author: Babak Vahdat <bvah...@apache.org>
>>> AuthorDate: Fri Sep 2 19:08:32 2022 +0200
>>>
>>> CAMEL-18452: Integrate azure-sdk-bom in a non-conflicting manner
>>> ---
>>> camel-dependencies/pom.xml | 13
>>> ++-----------
>>> components/camel-azure/camel-azure-cosmosdb/pom.xml | 1 -
>>> components/camel-azure/camel-azure-eventhubs/pom.xml | 2 --
>>> components/camel-azure/camel-azure-key-vault/pom.xml | 2 --
>>> components/camel-azure/camel-azure-servicebus/pom.xml | 2 --
>>> components/camel-azure/camel-azure-storage-blob/pom.xml | 6 ------
>>> .../camel-azure/camel-azure-storage-datalake/pom.xml | 2 --
>>> components/camel-azure/camel-azure-storage-queue/pom.xml | 5 -----
>>> components/camel-azure/pom.xml | 12
>>> ++++++++++++
>>> parent/pom.xml | 13
>>> ++-----------
>>> .../test/infra/azure/common/services/AzuriteContainer.java | 2 +-
>>> test-infra/camel-test-infra-azure-storage-blob/pom.xml | 13
>>> ++++++++++++-
>>> test-infra/camel-test-infra-azure-storage-datalake/pom.xml | 14
>>> ++++++++++++--
>>> test-infra/camel-test-infra-azure-storage-queue/pom.xml | 13
>>> ++++++++++++-
>>> 14 files changed, 53 insertions(+), 47 deletions(-)
>>>
>>> diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
>>> index 3ede6792b92..9c42df79abe 100644
>>> --- a/camel-dependencies/pom.xml
>>> +++ b/camel-dependencies/pom.xml
>>> @@ -66,17 +66,8 @@
>>> <aws-java-sdk2-version>2.17.250</aws-java-sdk2-version>
>>> <aws-xray-version>2.6.1</aws-xray-version>
>>> <axiom-version>1.2.14</axiom-version>
>>> - <azure-cosmos-version>4.29.1</azure-cosmos-version>
>>> - <azure-eventhubs-version>5.11.2</azure-eventhubs-version>
>>> - <azure-identity-version>1.5.1</azure-identity-version>
>>> - <azure-jackson2-version>2.13.3</azure-jackson2-version>
>>> - <azure-keyvault-secrets-version>4.4.2</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.1</azure-storage-blob-version>
>>> -
>>> <azure-storage-datalake-version>12.9.1</azure-storage-datalake-version>
>>> - <azure-storage-queue-version>12.12.2</azure-storage-queue-version>
>>> + <azure-sdk-bom-version>1.2.5</azure-sdk-bom-version>
>>> +
>>> <azure-storage-blob-changefeed-version>12.0.0-beta.18</azure-storage-blob-changefeed-version>
>>> <bouncycastle-version>1.71</bouncycastle-version>
>>> <box-java-sdk-version>2.58.0</box-java-sdk-version>
>>> <braintree-gateway-version>3.16.1</braintree-gateway-version>
>>> diff --git a/components/camel-azure/camel-azure-cosmosdb/pom.xml
>>> b/components/camel-azure/camel-azure-cosmosdb/pom.xml
>>> index a3e51258a28..2352f863b6c 100644
>>> --- a/components/camel-azure/camel-azure-cosmosdb/pom.xml
>>> +++ b/components/camel-azure/camel-azure-cosmosdb/pom.xml
>>> @@ -51,7 +51,6 @@
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>> <artifactId>azure-cosmos</artifactId>
>>> - <version>${azure-cosmos-version}</version>
>>> </dependency>
>>>
>>> <!-- extras -->
>>> diff --git a/components/camel-azure/camel-azure-eventhubs/pom.xml
>>> b/components/camel-azure/camel-azure-eventhubs/pom.xml
>>> index 9ae5d8e140d..8a84e077b41 100644
>>> --- a/components/camel-azure/camel-azure-eventhubs/pom.xml
>>> +++ b/components/camel-azure/camel-azure-eventhubs/pom.xml
>>> @@ -51,12 +51,10 @@
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>> <artifactId>azure-messaging-eventhubs</artifactId>
>>> - <version>${azure-eventhubs-version}</version>
>>> </dependency>
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>>
>>> <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
>>> -
>>> <version>${azure-messaging-eventhubs-checkpointstore-blob-version}</version>
>>> </dependency>
>>>
>>> <!-- extras -->
>>> diff --git a/components/camel-azure/camel-azure-key-vault/pom.xml
>>> b/components/camel-azure/camel-azure-key-vault/pom.xml
>>> index aeba745fff9..8816f75bac1 100644
>>> --- a/components/camel-azure/camel-azure-key-vault/pom.xml
>>> +++ b/components/camel-azure/camel-azure-key-vault/pom.xml
>>> @@ -45,12 +45,10 @@
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>> <artifactId>azure-security-keyvault-secrets</artifactId>
>>> - <version>${azure-keyvault-secrets-version}</version>
>>> </dependency>
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>> <artifactId>azure-identity</artifactId>
>>> - <version>${azure-identity-version}</version>
>>> </dependency>
>>>
>>> <!-- extras -->
>>> diff --git a/components/camel-azure/camel-azure-servicebus/pom.xml
>>> b/components/camel-azure/camel-azure-servicebus/pom.xml
>>> index c319e7c9869..86d250ada2a 100644
>>> --- a/components/camel-azure/camel-azure-servicebus/pom.xml
>>> +++ b/components/camel-azure/camel-azure-servicebus/pom.xml
>>> @@ -51,12 +51,10 @@
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>> <artifactId>azure-messaging-servicebus</artifactId>
>>> - <version>${azure-messaging-servicebus-version}</version>
>>> </dependency>
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>> <artifactId>azure-identity</artifactId>
>>> - <version>${azure-identity-version}</version>
>>> </dependency>
>>>
>>> <!-- extras -->
>>> diff --git a/components/camel-azure/camel-azure-storage-blob/pom.xml
>>> b/components/camel-azure/camel-azure-storage-blob/pom.xml
>>> index d2ea02a8b68..b2a3c46d610 100644
>>> --- a/components/camel-azure/camel-azure-storage-blob/pom.xml
>>> +++ b/components/camel-azure/camel-azure-storage-blob/pom.xml
>>> @@ -45,7 +45,6 @@
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>> <artifactId>azure-storage-blob</artifactId>
>>> - <version>${azure-storage-blob-version}</version>
>>> </dependency>
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>> @@ -55,27 +54,22 @@
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>> <artifactId>azure-identity</artifactId>
>>> - <version>${azure-identity-version}</version>
>>> </dependency>
>>> <dependency>
>>> <groupId>com.fasterxml.jackson.core</groupId>
>>> <artifactId>jackson-databind</artifactId>
>>> - <version>${azure-jackson2-version}</version>
>>> </dependency>
>>> <dependency>
>>> <groupId>com.fasterxml.jackson.core</groupId>
>>> <artifactId>jackson-core</artifactId>
>>> - <version>${azure-jackson2-version}</version>
>>> </dependency>
>>> <dependency>
>>> <groupId>com.fasterxml.jackson.core</groupId>
>>> <artifactId>jackson-annotations</artifactId>
>>> - <version>${azure-jackson2-version}</version>
>>> </dependency>
>>> <dependency>
>>> <groupId>com.fasterxml.jackson.dataformat</groupId>
>>> <artifactId>jackson-dataformat-xml</artifactId>
>>> - <version>${azure-jackson2-version}</version>
>>> </dependency>
>>>
>>> <!-- extras -->
>>> diff --git a/components/camel-azure/camel-azure-storage-datalake/pom.xml
>>> b/components/camel-azure/camel-azure-storage-datalake/pom.xml
>>> index 9daa02780a8..2c3692760cb 100644
>>> --- a/components/camel-azure/camel-azure-storage-datalake/pom.xml
>>> +++ b/components/camel-azure/camel-azure-storage-datalake/pom.xml
>>> @@ -37,12 +37,10 @@
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>> <artifactId>azure-storage-file-datalake</artifactId>
>>> - <version>${azure-storage-datalake-version}</version>
>>> </dependency>
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>> <artifactId>azure-identity</artifactId>
>>> - <version>${azure-identity-version}</version>
>>> </dependency>
>>>
>>> <dependency>
>>> diff --git a/components/camel-azure/camel-azure-storage-queue/pom.xml
>>> b/components/camel-azure/camel-azure-storage-queue/pom.xml
>>> index 53c27785066..c398868c5f0 100644
>>> --- a/components/camel-azure/camel-azure-storage-queue/pom.xml
>>> +++ b/components/camel-azure/camel-azure-storage-queue/pom.xml
>>> @@ -45,28 +45,23 @@
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>> <artifactId>azure-storage-queue</artifactId>
>>> - <version>${azure-storage-queue-version}</version>
>>> </dependency>
>>>
>>> <dependency>
>>> <groupId>com.fasterxml.jackson.core</groupId>
>>> <artifactId>jackson-databind</artifactId>
>>> - <version>${azure-jackson2-version}</version>
>>> </dependency>
>>> <dependency>
>>> <groupId>com.fasterxml.jackson.core</groupId>
>>> <artifactId>jackson-core</artifactId>
>>> - <version>${azure-jackson2-version}</version>
>>> </dependency>
>>> <dependency>
>>> <groupId>com.fasterxml.jackson.core</groupId>
>>> <artifactId>jackson-annotations</artifactId>
>>> - <version>${azure-jackson2-version}</version>
>>> </dependency>
>>> <dependency>
>>> <groupId>com.fasterxml.jackson.dataformat</groupId>
>>> <artifactId>jackson-dataformat-xml</artifactId>
>>> - <version>${azure-jackson2-version}</version>
>>> </dependency>
>>>
>>> <!-- extras -->
>>> diff --git a/components/camel-azure/pom.xml
>>> b/components/camel-azure/pom.xml
>>> index 8bb2a094f9a..79d50cfe7a5 100644
>>> --- a/components/camel-azure/pom.xml
>>> +++ b/components/camel-azure/pom.xml
>>> @@ -32,6 +32,18 @@
>>> <name>Camel :: Azure :: Parent</name>
>>> <description>Camel Azure parent</description>
>>>
>>> + <dependencyManagement>
>>> + <dependencies>
>>> + <dependency>
>>> + <groupId>com.azure</groupId>
>>> + <artifactId>azure-sdk-bom</artifactId>
>>> + <version>${azure-sdk-bom-version}</version>
>>> + <type>pom</type>
>>> + <scope>import</scope>
>>> + </dependency>
>>> + </dependencies>
>>> + </dependencyManagement>
>>> +
>>> <modules>
>>> <module>camel-azure-eventhubs</module>
>>> <module>camel-azure-storage-blob</module>
>>> diff --git a/parent/pom.xml b/parent/pom.xml
>>> index 1f9814bee9a..ec7b0298447 100644
>>> --- a/parent/pom.xml
>>> +++ b/parent/pom.xml
>>> @@ -83,17 +83,8 @@
>>> <aws-java-sdk2-version>2.17.250</aws-java-sdk2-version>
>>> <aws-xray-version>2.6.1</aws-xray-version>
>>> <axiom-version>1.2.14</axiom-version>
>>> - <azure-jackson2-version>2.13.3</azure-jackson2-version>
>>> - <azure-cosmos-version>4.29.1</azure-cosmos-version>
>>> - <azure-eventhubs-version>5.11.2</azure-eventhubs-version>
>>> - <azure-identity-version>1.5.1</azure-identity-version>
>>> -
>>> <azure-keyvault-secrets-version>4.4.2</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.1</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.1</azure-storage-datalake-version>
>>> - <azure-storage-queue-version>12.12.2</azure-storage-queue-version>
>>> + <azure-sdk-bom-version>1.2.5</azure-sdk-bom-version>
>>> +
>>> <azure-storage-blob-changefeed-version>12.0.0-beta.18</azure-storage-blob-changefeed-version>
>>> <bouncycastle-version>1.71</bouncycastle-version>
>>> <box-java-sdk-version>2.58.0</box-java-sdk-version>
>>> <braintree-gateway-version>3.16.1</braintree-gateway-version>
>>> diff --git
>>> a/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
>>> b/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
>>> index 09ac0c7d0fc..4d4360fdef9 100644
>>> ---
>>> a/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
>>> +++
>>> b/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
>>> @@ -26,7 +26,7 @@ public class AzuriteContainer extends
>>> GenericContainer<AzuriteContainer> {
>>> public static final String DEFAULT_ACCOUNT_KEY
>>> =
>>> "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==";
>>>
>>> - public static final String IMAGE_NAME = "
>>> mcr.microsoft.com/azure-storage/azurite:3.16.0";
>>> + public static final String IMAGE_NAME = "
>>> mcr.microsoft.com/azure-storage/azurite:3.19.0";
>>>
>>> public AzuriteContainer() {
>>> this(IMAGE_NAME);
>>> diff --git a/test-infra/camel-test-infra-azure-storage-blob/pom.xml
>>> b/test-infra/camel-test-infra-azure-storage-blob/pom.xml
>>> index 55206f98c9f..9af131e01c0 100644
>>> --- a/test-infra/camel-test-infra-azure-storage-blob/pom.xml
>>> +++ b/test-infra/camel-test-infra-azure-storage-blob/pom.xml
>>> @@ -29,6 +29,18 @@
>>> <name>Camel :: Test Infra :: Azure Storage Blob</name>
>>> <artifactId>camel-test-infra-azure-storage-blob</artifactId>
>>>
>>> + <dependencyManagement>
>>> + <dependencies>
>>> + <dependency>
>>> + <groupId>com.azure</groupId>
>>> + <artifactId>azure-sdk-bom</artifactId>
>>> + <version>${azure-sdk-bom-version}</version>
>>> + <type>pom</type>
>>> + <scope>import</scope>
>>> + </dependency>
>>> + </dependencies>
>>> + </dependencyManagement>
>>> +
>>> <dependencies>
>>> <dependency>
>>> <groupId>org.apache.camel</groupId>
>>> @@ -53,7 +65,6 @@
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>> <artifactId>azure-storage-blob</artifactId>
>>> - <version>${azure-storage-blob-version}</version>
>>> </dependency>
>>> </dependencies>
>>>
>>> diff --git a/test-infra/camel-test-infra-azure-storage-datalake/pom.xml
>>> b/test-infra/camel-test-infra-azure-storage-datalake/pom.xml
>>> index 75ba531a1fb..96172391d7d 100644
>>> --- a/test-infra/camel-test-infra-azure-storage-datalake/pom.xml
>>> +++ b/test-infra/camel-test-infra-azure-storage-datalake/pom.xml
>>> @@ -25,6 +25,18 @@
>>> <name>Camel :: Test Infra :: Azure Storage Datalake</name>
>>> <artifactId>camel-test-infra-azure-storage-datalake</artifactId>
>>>
>>> + <dependencyManagement>
>>> + <dependencies>
>>> + <dependency>
>>> + <groupId>com.azure</groupId>
>>> + <artifactId>azure-sdk-bom</artifactId>
>>> + <version>${azure-sdk-bom-version}</version>
>>> + <type>pom</type>
>>> + <scope>import</scope>
>>> + </dependency>
>>> + </dependencies>
>>> + </dependencyManagement>
>>> +
>>> <dependencies>
>>> <dependency>
>>> <groupId>org.apache.camel</groupId>
>>> @@ -44,12 +56,10 @@
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>> <artifactId>azure-storage-file-datalake</artifactId>
>>> - <version>${azure-storage-datalake-version}</version>
>>> </dependency>
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>> <artifactId>azure-identity</artifactId>
>>> - <version>${azure-identity-version}</version>
>>> </dependency>
>>> </dependencies>
>>>
>>> diff --git a/test-infra/camel-test-infra-azure-storage-queue/pom.xml
>>> b/test-infra/camel-test-infra-azure-storage-queue/pom.xml
>>> index 7111d0c5837..f1d6a1afe9e 100644
>>> --- a/test-infra/camel-test-infra-azure-storage-queue/pom.xml
>>> +++ b/test-infra/camel-test-infra-azure-storage-queue/pom.xml
>>> @@ -29,6 +29,18 @@
>>> <name>Camel :: Test Infra :: Azure Storage Queue</name>
>>> <artifactId>camel-test-infra-azure-storage-queue</artifactId>
>>>
>>> + <dependencyManagement>
>>> + <dependencies>
>>> + <dependency>
>>> + <groupId>com.azure</groupId>
>>> + <artifactId>azure-sdk-bom</artifactId>
>>> + <version>${azure-sdk-bom-version}</version>
>>> + <type>pom</type>
>>> + <scope>import</scope>
>>> + </dependency>
>>> + </dependencies>
>>> + </dependencyManagement>
>>> +
>>> <dependencies>
>>> <dependency>
>>> <groupId>org.apache.camel</groupId>
>>> @@ -53,7 +65,6 @@
>>> <dependency>
>>> <groupId>com.azure</groupId>
>>> <artifactId>azure-storage-queue</artifactId>
>>> - <version>${azure-storage-queue-version}</version>
>>> </dependency>
>>> </dependencies>
>>>
>>>
>>>
>>
>> --
>> Claus Ibsen
>> -----------------
>> http://davsclaus.com @davsclaus
>> Camel in Action 2: https://www.manning.com/ibsen2
>
