This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a commit to branch CAMEL-18452 in repository https://gitbox.apache.org/repos/asf/camel.git
commit fc6b536ebf5bb7a8eb4fc2bc0b6153609e60c9d6 Author: Babak Vahdat <[email protected]> AuthorDate: Fri Sep 2 12:25: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/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 ++++++++++++- 13 files changed, 52 insertions(+), 46 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 2ab96a6e2eb..ffb0d204384 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -68,17 +68,8 @@ <aws-java-sdk2-version>2.17.266</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.18.0</braintree-gateway-version> diff --git a/components/camel-azure/camel-azure-cosmosdb/pom.xml b/components/camel-azure/camel-azure-cosmosdb/pom.xml index f5d6d4b2fc1..87368edcc42 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 18f00225c29..9d9fb395845 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 4048ba123e3..be9f1bc573e 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 1b6dc525f17..c91651cc344 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 a13473634d5..5fcf36e6c42 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 016be914611..22709c565f3 100644 --- a/components/camel-azure/camel-azure-storage-datalake/pom.xml +++ b/components/camel-azure/camel-azure-storage-datalake/pom.xml @@ -38,12 +38,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 e7f27b81364..12cd6427a93 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 f6ef85ea3a7..575044d855f 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 52b3e9562d7..b25e5c43a70 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -85,17 +85,8 @@ <aws-java-sdk2-version>2.17.266</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.18.0</braintree-gateway-version> 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 1ab2d17655c..6c7a5f1b1cf 100644 --- a/test-infra/camel-test-infra-azure-storage-blob/pom.xml +++ b/test-infra/camel-test-infra-azure-storage-blob/pom.xml @@ -31,6 +31,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> @@ -55,7 +67,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 8ae3d0d4372..28c8738b3a8 100644 --- a/test-infra/camel-test-infra-azure-storage-datalake/pom.xml +++ b/test-infra/camel-test-infra-azure-storage-datalake/pom.xml @@ -27,6 +27,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> @@ -46,12 +58,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 e608faf2518..b60421261df 100644 --- a/test-infra/camel-test-infra-azure-storage-queue/pom.xml +++ b/test-infra/camel-test-infra-azure-storage-queue/pom.xml @@ -31,6 +31,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> @@ -55,7 +67,6 @@ <dependency> <groupId>com.azure</groupId> <artifactId>azure-storage-queue</artifactId> - <version>${azure-storage-queue-version}</version> </dependency> </dependencies>
