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.

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

Upgrade Azure Spring modules version to 4.0 in the 4.0 branch #23883

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 27 additions & 27 deletions eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -420,57 +420,57 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-core</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-core;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-core;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-autoconfigure</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-autoconfigure;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-autoconfigure;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-resourcemanager</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-resourcemanager;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-resourcemanager;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter</artifactId>
<version>3.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-active-directory</artifactId>
<version>3.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-active-directory;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-active-directory;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-keyvault-certificates</artifactId>
<version>3.2.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-keyvault-certificates;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-keyvault-certificates;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-keyvault-secrets</artifactId>
<version>3.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-keyvault-secrets;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-keyvault-secrets;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-servicebus-jms</artifactId>
<version>3.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-servicebus-jms;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-servicebus-jms;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-active-directory-b2c</artifactId>
<version>3.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-active-directory-b2c;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-active-directory-b2c;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-cosmos</artifactId>
<version>3.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-cosmos;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-cosmos;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-storage</artifactId>
<version>3.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-storage;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-storage;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -480,32 +480,32 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-integration-core</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-core;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-core;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-integration-test</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-test;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-test;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-integration-eventhubs</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-eventhubs;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-eventhubs;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-integration-servicebus</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-servicebus;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-servicebus;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-integration-storage-queue</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-storage-queue;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-storage-queue;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-messaging</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-messaging;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-messaging;current} -->
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
Expand All @@ -515,52 +515,52 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter-cache</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-cache;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-cache;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter-eventhubs</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-eventhubs;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-eventhubs;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter-eventhubs-kafka</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-eventhubs-kafka;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-eventhubs-kafka;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter-servicebus</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-servicebus;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-servicebus;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter-storage-queue</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-storage-queue;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-storage-queue;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-stream-binder-servicebus-core</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-servicebus-core;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-servicebus-core;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-stream-binder-test</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-test;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-test;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-stream-binder-servicebus-topic</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-servicebus-topic;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-servicebus-topic;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-stream-binder-servicebus-queue</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-servicebus-queue;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-servicebus-queue;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-stream-binder-eventhubs</artifactId>
<version>2.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-eventhubs;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-eventhubs;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
54 changes: 27 additions & 27 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -147,33 +147,33 @@ com.azure.spring:azure-spring-cloud-feature-management;2.0.0;2.1.0-beta.1
com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.0.0;2.1.0
com.azure.spring:azure-spring-boot-bom;3.7.0;3.8.0
com.azure.spring:azure-spring-cloud-dependencies;2.7.0;2.8.0
com.azure.spring:azure-spring-boot-starter-active-directory-b2c;3.8.0;3.9.0-beta.1
com.azure.spring:azure-spring-boot-starter-active-directory;3.8.0;3.9.0-beta.1
com.azure.spring:azure-spring-boot-starter-cosmos;3.8.0;3.9.0-beta.1
com.azure.spring:azure-spring-boot-starter-keyvault-certificates;3.1.0;3.2.0-beta.1
com.azure.spring:azure-spring-boot-starter-keyvault-secrets;3.8.0;3.9.0-beta.1
com.azure.spring:azure-spring-boot-starter-servicebus-jms;3.8.0;3.9.0-beta.1
com.azure.spring:azure-spring-boot-starter-storage;3.8.0;3.9.0-beta.1
com.azure.spring:azure-spring-cloud-autoconfigure;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-cloud-core;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-cloud-resourcemanager;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-cloud-starter;3.8.0;3.9.0-beta.1
com.azure.spring:azure-spring-cloud-messaging;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-cloud-starter-cache;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-cloud-starter-eventhubs-kafka;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-cloud-starter-eventhubs;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-cloud-starter-servicebus;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-cloud-starter-storage-queue;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-eventhubs;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-servicebus-core;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-servicebus-queue;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-servicebus-topic;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-test;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-integration-core;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-integration-eventhubs;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-integration-servicebus;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-integration-storage-queue;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-integration-test;2.8.0;2.9.0-beta.1
com.azure.spring:azure-spring-boot-starter-active-directory-b2c;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-boot-starter-active-directory;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-boot-starter-cosmos;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-boot-starter-keyvault-certificates;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-boot-starter-keyvault-secrets;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-boot-starter-servicebus-jms;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-boot-starter-storage;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-cloud-autoconfigure;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-cloud-core;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-cloud-resourcemanager;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-cloud-starter;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-cloud-messaging;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-cloud-starter-cache;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-cloud-starter-eventhubs-kafka;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-cloud-starter-eventhubs;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-cloud-starter-servicebus;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-cloud-starter-storage-queue;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-eventhubs;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-servicebus-core;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-servicebus-queue;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-servicebus-topic;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-test;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-integration-core;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-integration-eventhubs;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-integration-servicebus;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-integration-storage-queue;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-integration-test;4.0.0-beta.1;4.0.0-beta.1
com.azure.spring:azure-spring-boot-test-aad;1.0.0;1.0.0
com.azure.spring:azure-spring-boot-test-aad-b2c;1.0.0;1.0.0
com.azure.spring:azure-spring-boot-test-selenium-common;1.0.0;1.0.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release History

## 3.9.0-beta.1 (Unreleased)
## 4.0.0-beta.1 (Unreleased)

### Features Added

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-active-directory-b2c</artifactId>
<version>3.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-active-directory-b2c;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-active-directory-b2c;current} -->

<name>Azure Spring Boot Starter for Azure AD B2C Spring Security Integration</name>
<description>Spring Boot Starter for Azure AD B2C and Spring Security Integration</description>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter</artifactId>
<version>3.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter;current} -->
</dependency>

<!-- Below poms will be replaced to azure-spring-boot-starter pom when no milestone tag. -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# Release History

## 3.9.0-beta.1 (Unreleased)

### Features Added

### Breaking Changes
## 4.0.0-beta.1 (Unreleased)

### Bugs Fixed
- Fix bug about application type validation. ([#23481](https://github.com/Azure/azure-sdk-for-java/issues/23481))
Expand All @@ -20,9 +16,6 @@
### Deprecations
- Deprecate `azure.activedirectory.authorization-clients.xxx.on-demand`, use `azure.activedirectory.authorization-clients.xxx.authorization-grant-type` instead. If you are using `on-demand=true`, please change to `authorization-grant-type=authorization_code`.

### Other Changes


## 3.8.0 (2021-08-25)
This release is compatible with Spring Boot 2.5.0 - 2.5.3.
### Dependency Upgrades
Expand Down
4 changes: 2 additions & 2 deletions sdk/spring/azure-spring-boot-starter-active-directory/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-active-directory</artifactId>
<version>3.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-active-directory;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-active-directory;current} -->

<name>Azure Spring Boot Starter for Azure AD Spring Security Integration</name>
<description>Spring Boot Starter for Azure AD and Spring Security Integration</description>
Expand All @@ -23,7 +23,7 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter</artifactId>
<version>3.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter;current} -->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/azure-spring-boot-starter-cosmos/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release History

## 3.9.0-beta.1 (Unreleased)
## 4.0.0-beta.1 (Unreleased)

### Features Added

Expand Down
4 changes: 2 additions & 2 deletions sdk/spring/azure-spring-boot-starter-cosmos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-cosmos</artifactId>
<version>3.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-cosmos;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-cosmos;current} -->

<name>Azure Spring Boot Starter for Azure Cosmos DB</name>
<description>Spring Boot Starter for Azure Document DB service</description>
Expand All @@ -23,7 +23,7 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter</artifactId>
<version>3.9.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter;current} -->
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release History

## 3.2.0-beta.1 (Unreleased)
## 4.0.0-beta.1 (Unreleased)

### Features Added

Expand Down
Loading