Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare to release azure-spring-bom and azure-spring-cloud-dependencies. #24425

Merged
merged 3 commits into from
Sep 30, 2021
Merged

Prepare to release azure-spring-bom and azure-spring-cloud-dependencies. #24425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff75b89
Prepare to release azure-spring-bom and azure-spring-cloud-dependencies.
rujche Sep 28, 2021
b9acdfe
Merge branch 'main' into prepare_to_release_azure-spring-bom_and_azur…
rujche Sep 30, 2021
1f7df30
Import azure-sdk-bom, and delete unnecessary items in dependency mana…
rujche Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 17 additions & 55 deletions sdk/boms/azure-spring-boot-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<packageOutputDirectory>${project.build.directory}</packageOutputDirectory>
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
<azure.spring.boot.version>${project.version}</azure.spring.boot.version>
<azure.core.version>1.20.0</azure.core.version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<azure.identity.version>1.3.6</azure.identity.version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
<azure.keyvault.secret.version>4.3.3</azure.keyvault.secret.version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
<azure.keyvault.jca.version>2.0.0</azure.keyvault.jca.version>
<azure.msal.version>1.10.1</azure.msal.version> <!-- {x-version-update;com.microsoft.azure:msal4j;external_dependency} -->
<azure.keyvault.jca.version>2.1.0</azure.keyvault.jca.version> <!-- {x-version-update;com.azure:azure-security-keyvault-jca;dependency} -->
<azure.servicebus.jms.version>0.0.7</azure.servicebus.jms.version> <!-- {x-version-update;com.microsoft.azure:azure-servicebus-jms;external_dependency} -->
<azure.spring.boot.starter.keyvault.certificates.version>3.1.0</azure.spring.boot.starter.keyvault.certificates.version>
<azure.spring.boot.starter.keyvault.certificates.version>3.2.0</azure.spring.boot.starter.keyvault.certificates.version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-keyvault-certificates;dependency} -->
<azure.spring.data.cosmos.version>3.11.0</azure.spring.data.cosmos.version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;dependency} -->
<azure.storage.blob.version>12.14.0</azure.storage.blob.version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
<azure.storage.fileshare.version>12.11.0</azure.storage.fileshare.version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
</properties>

<issueManagement>
Expand All @@ -57,37 +50,44 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-sdk-bom</artifactId>
<version>1.0.4</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why don't we have a property entry for this version?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use number here is more straightforward. Just like azure-sdk-bom did.

<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Azure Dependencies Bom -->
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot</artifactId>
<version>${azure.spring.boot.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter</artifactId>
<version>${azure.spring.boot.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-active-directory</artifactId>
<version>${azure.spring.boot.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-active-directory-b2c</artifactId>
<version>${azure.spring.boot.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-cosmos</artifactId>
<version>${azure.spring.boot.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-keyvault-secrets</artifactId>
<version>${azure.spring.boot.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
Expand All @@ -97,68 +97,30 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-servicebus-jms</artifactId>
<version>${azure.spring.boot.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-storage</artifactId>
<version>${azure.spring.boot.version}</version>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-spring-data-cosmos</artifactId>
<version>${azure.spring.data.cosmos.version}</version>
</dependency>

<!-- Azure libraries-->
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>${azure.core.version}</version>
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>${azure.identity.version}</version>
</dependency>

<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>msal4j</artifactId>
<version>${azure.msal.version}</version>
</dependency>

<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-servicebus-jms</artifactId>
<version>${azure.servicebus.jms.version}</version>
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-secrets</artifactId>
<version>${azure.keyvault.secret.version}</version>
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-jca</artifactId>
<version>${azure.keyvault.jca.version}</version>
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>${azure.storage.blob.version}</version>
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-share</artifactId>
<version>${azure.storage.fileshare.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
78 changes: 24 additions & 54 deletions sdk/boms/azure-spring-cloud-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,97 +43,97 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<packageOutputDirectory>${project.build.directory}</packageOutputDirectory>
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
<azure.core.version>1.20.0</azure.core.version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<azure.eventhubs.checkpoint.version>1.10.0</azure.eventhubs.checkpoint.version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
<azure.eventhubs.version>5.10.1</azure.eventhubs.version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
<azure.identity.version>1.3.6</azure.identity.version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
<azure.servicebus.version>7.4.1</azure.servicebus.version> <!-- {x-version-update;com.azure:azure-messaging-servicebus;dependency} -->
<azure.resourcemanager.version>2.8.0</azure.resourcemanager.version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
<azure.spring.appconfigure.version>2.1.0</azure.spring.appconfigure.version>
<azure.spring.appconfigure.starter.version>2.1.0</azure.spring.appconfigure.starter.version>
<azure.spring.appconfigure.feature.management.version>2.0.0</azure.spring.appconfigure.feature.management.version>
<azure.spring.cloud.version>${project.version}</azure.spring.cloud.version>
<azure.storage.queue.version>12.11.0</azure.storage.queue.version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
<azure.spring.appconfigure.version>2.1.1</azure.spring.appconfigure.version>
<azure.spring.appconfigure.starter.version>2.1.1</azure.spring.appconfigure.starter.version>
<azure.spring.appconfigure.feature.management.version>2.0.1</azure.spring.appconfigure.feature.management.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-sdk-bom</artifactId>
<version>1.0.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Azure Spring Integration -->
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-integration-eventhubs</artifactId>
<version>${azure.spring.cloud.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-integration-servicebus</artifactId>
<version>${azure.spring.cloud.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-integration-storage-queue</artifactId>
<version>${azure.spring.cloud.version}</version>
<version>${project.version}</version>
</dependency>

<!-- Azure Spring Cloud-->
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-context</artifactId>
<version>${azure.spring.cloud.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-autoconfigure</artifactId>
<version>${azure.spring.cloud.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-messaging</artifactId>
<version>${azure.spring.cloud.version}</version>
<version>${project.version}</version>
</dependency>

<!-- Azure Spring Cloud Stream Binder -->
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-stream-binder-eventhubs</artifactId>
<version>${azure.spring.cloud.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-stream-binder-servicebus-topic</artifactId>
<version>${azure.spring.cloud.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-stream-binder-servicebus-queue</artifactId>
<version>${azure.spring.cloud.version}</version>
<version>${project.version}</version>
</dependency>

<!--Spring Cloud Azure Starters-->
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter-cache</artifactId>
<version>${azure.spring.cloud.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter-servicebus</artifactId>
<version>${azure.spring.cloud.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter-eventhubs</artifactId>
<version>${azure.spring.cloud.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter-eventhubs-kafka</artifactId>
<version>${azure.spring.cloud.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter-storage-queue</artifactId>
<version>${azure.spring.cloud.version}</version>
<version>${project.version}</version>
</dependency>

<!-- App Configuration -->
Expand Down Expand Up @@ -164,41 +164,11 @@
</dependency>

<!--Azure SDK-->
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>${azure.core.version}</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>${azure.identity.version}</version>
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager</artifactId>
<version>${azure.resourcemanager.version}</version>
</dependency>
<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.eventhubs.checkpoint.version}</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-servicebus</artifactId>
<version>${azure.servicebus.version}</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-queue</artifactId>
<version>${azure.storage.queue.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down