Skip to content

Commit 519f565

Browse files
authored
Merge to main after spring cloud azure 5.20.1 released (Azure#44484)
1 parent 07b9fc8 commit 519f565

File tree

32 files changed

+173
-59
lines changed

32 files changed

+173
-59
lines changed

eng/versioning/version_client.txt

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -209,60 +209,60 @@ com.azure:identity-test-vm;1.0.0-beta.1;1.0.0-beta.1
209209
com.azure:identity-test-webapp;1.0.0-beta.1;1.0.0-beta.1
210210
com.azure:azure-ai-vision-face;1.0.0-beta.2;1.0.0-beta.3
211211
com.azure.spring:azure-monitor-spring-native-test;1.0.0-beta.1;1.0.0-beta.1
212-
com.azure.spring:spring-cloud-azure-appconfiguration-config-web;5.20.0;5.21.0-beta.1
213-
com.azure.spring:spring-cloud-azure-appconfiguration-config;5.20.0;5.21.0-beta.1
214-
com.azure.spring:spring-cloud-azure-feature-management-web;5.20.0;5.21.0-beta.1
215-
com.azure.spring:spring-cloud-azure-feature-management;5.20.0;5.21.0-beta.1
216-
com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;5.20.0;5.21.0-beta.1
217-
com.azure.spring:spring-cloud-azure-dependencies;5.20.0;5.21.0-beta.1
218-
com.azure.spring:spring-messaging-azure;5.20.0;5.21.0-beta.1
219-
com.azure.spring:spring-messaging-azure-eventhubs;5.20.0;5.21.0-beta.1
220-
com.azure.spring:spring-messaging-azure-servicebus;5.20.0;5.21.0-beta.1
221-
com.azure.spring:spring-messaging-azure-storage-queue;5.20.0;5.21.0-beta.1
222-
com.azure.spring:spring-integration-azure-core;5.20.0;5.21.0-beta.1
223-
com.azure.spring:spring-integration-azure-eventhubs;5.20.0;5.21.0-beta.1
224-
com.azure.spring:spring-integration-azure-servicebus;5.20.0;5.21.0-beta.1
225-
com.azure.spring:spring-integration-azure-storage-queue;5.20.0;5.21.0-beta.1
226-
com.azure.spring:spring-cloud-azure-core;5.20.0;5.21.0-beta.1
227-
com.azure.spring:spring-cloud-azure-actuator-autoconfigure;5.20.0;5.21.0-beta.1
228-
com.azure.spring:spring-cloud-azure-actuator;5.20.0;5.21.0-beta.1
229-
com.azure.spring:spring-cloud-azure-autoconfigure;5.20.0;5.21.0-beta.1
230-
com.azure.spring:spring-cloud-azure-docker-compose;5.20.0;5.21.0-beta.1
231-
com.azure.spring:spring-cloud-azure-resourcemanager;5.20.0;5.21.0-beta.1
232-
com.azure.spring:spring-cloud-azure-service;5.20.0;5.21.0-beta.1
233-
com.azure.spring:spring-cloud-azure-starter-active-directory;5.20.0;5.21.0-beta.1
234-
com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;5.20.0;5.21.0-beta.1
235-
com.azure.spring:spring-cloud-azure-starter-actuator;5.20.0;5.21.0-beta.1
236-
com.azure.spring:spring-cloud-azure-starter-appconfiguration;5.20.0;5.21.0-beta.1
237-
com.azure.spring:spring-cloud-azure-starter-cosmos;5.20.0;5.21.0-beta.1
238-
com.azure.spring:spring-cloud-azure-starter-data-cosmos;5.20.0;5.21.0-beta.1
239-
com.azure.spring:spring-cloud-azure-starter-data-redis-lettuce;5.20.0;5.21.0-beta.1
240-
com.azure.spring:spring-cloud-azure-starter-eventhubs;5.20.0;5.21.0-beta.1
241-
com.azure.spring:spring-cloud-azure-starter-eventgrid;5.20.0;5.21.0-beta.1
242-
com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;5.20.0;5.21.0-beta.1
243-
com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;5.20.0;5.21.0-beta.1
244-
com.azure.spring:spring-cloud-azure-starter-keyvault;5.20.0;5.21.0-beta.1
245-
com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;5.20.0;5.21.0-beta.1
246-
com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;5.20.0;5.21.0-beta.1
212+
com.azure.spring:spring-cloud-azure-appconfiguration-config-web;5.20.1;5.21.0-beta.1
213+
com.azure.spring:spring-cloud-azure-appconfiguration-config;5.20.1;5.21.0-beta.1
214+
com.azure.spring:spring-cloud-azure-feature-management-web;5.20.1;5.21.0-beta.1
215+
com.azure.spring:spring-cloud-azure-feature-management;5.20.1;5.21.0-beta.1
216+
com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;5.20.1;5.21.0-beta.1
217+
com.azure.spring:spring-cloud-azure-dependencies;5.20.1;5.21.0-beta.1
218+
com.azure.spring:spring-messaging-azure;5.20.1;5.21.0-beta.1
219+
com.azure.spring:spring-messaging-azure-eventhubs;5.20.1;5.21.0-beta.1
220+
com.azure.spring:spring-messaging-azure-servicebus;5.20.1;5.21.0-beta.1
221+
com.azure.spring:spring-messaging-azure-storage-queue;5.20.1;5.21.0-beta.1
222+
com.azure.spring:spring-integration-azure-core;5.20.1;5.21.0-beta.1
223+
com.azure.spring:spring-integration-azure-eventhubs;5.20.1;5.21.0-beta.1
224+
com.azure.spring:spring-integration-azure-servicebus;5.20.1;5.21.0-beta.1
225+
com.azure.spring:spring-integration-azure-storage-queue;5.20.1;5.21.0-beta.1
226+
com.azure.spring:spring-cloud-azure-core;5.20.1;5.21.0-beta.1
227+
com.azure.spring:spring-cloud-azure-actuator-autoconfigure;5.20.1;5.21.0-beta.1
228+
com.azure.spring:spring-cloud-azure-actuator;5.20.1;5.21.0-beta.1
229+
com.azure.spring:spring-cloud-azure-autoconfigure;5.20.1;5.21.0-beta.1
230+
com.azure.spring:spring-cloud-azure-docker-compose;5.20.1;5.21.0-beta.1
231+
com.azure.spring:spring-cloud-azure-resourcemanager;5.20.1;5.21.0-beta.1
232+
com.azure.spring:spring-cloud-azure-service;5.20.1;5.21.0-beta.1
233+
com.azure.spring:spring-cloud-azure-starter-active-directory;5.20.1;5.21.0-beta.1
234+
com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;5.20.1;5.21.0-beta.1
235+
com.azure.spring:spring-cloud-azure-starter-actuator;5.20.1;5.21.0-beta.1
236+
com.azure.spring:spring-cloud-azure-starter-appconfiguration;5.20.1;5.21.0-beta.1
237+
com.azure.spring:spring-cloud-azure-starter-cosmos;5.20.1;5.21.0-beta.1
238+
com.azure.spring:spring-cloud-azure-starter-data-cosmos;5.20.1;5.21.0-beta.1
239+
com.azure.spring:spring-cloud-azure-starter-data-redis-lettuce;5.20.1;5.21.0-beta.1
240+
com.azure.spring:spring-cloud-azure-starter-eventhubs;5.20.1;5.21.0-beta.1
241+
com.azure.spring:spring-cloud-azure-starter-eventgrid;5.20.1;5.21.0-beta.1
242+
com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;5.20.1;5.21.0-beta.1
243+
com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;5.20.1;5.21.0-beta.1
244+
com.azure.spring:spring-cloud-azure-starter-keyvault;5.20.1;5.21.0-beta.1
245+
com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;5.20.1;5.21.0-beta.1
246+
com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;5.20.1;5.21.0-beta.1
247247
com.azure.spring:spring-cloud-azure-starter-monitor;1.0.0-beta.6;1.0.0-beta.7
248-
com.azure.spring:spring-cloud-azure-starter-servicebus-jms;5.20.0;5.21.0-beta.1
249-
com.azure.spring:spring-cloud-azure-starter-servicebus;5.20.0;5.21.0-beta.1
250-
com.azure.spring:spring-cloud-azure-starter-storage;5.20.0;5.21.0-beta.1
251-
com.azure.spring:spring-cloud-azure-starter-storage-blob;5.20.0;5.21.0-beta.1
252-
com.azure.spring:spring-cloud-azure-starter-storage-file-share;5.20.0;5.21.0-beta.1
253-
com.azure.spring:spring-cloud-azure-starter-storage-queue;5.20.0;5.21.0-beta.1
254-
com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;5.20.0;5.21.0-beta.1
255-
com.azure.spring:spring-cloud-azure-starter-integration-servicebus;5.20.0;5.21.0-beta.1
256-
com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;5.20.0;5.21.0-beta.1
257-
com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;5.20.0;5.21.0-beta.1
258-
com.azure.spring:spring-cloud-azure-starter-stream-servicebus;5.20.0;5.21.0-beta.1
259-
com.azure.spring:spring-cloud-azure-starter;5.20.0;5.21.0-beta.1
260-
com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;5.20.0;5.21.0-beta.1
261-
com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;5.20.0;5.21.0-beta.1
262-
com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;5.20.0;5.21.0-beta.1
263-
com.azure.spring:spring-cloud-azure-stream-binder-servicebus;5.20.0;5.21.0-beta.1
264-
com.azure.spring:spring-cloud-azure-testcontainers;5.20.0;5.21.0-beta.1
265-
com.azure:azure-spring-data-cosmos;5.20.0;5.21.0-beta.1
248+
com.azure.spring:spring-cloud-azure-starter-servicebus-jms;5.20.1;5.21.0-beta.1
249+
com.azure.spring:spring-cloud-azure-starter-servicebus;5.20.1;5.21.0-beta.1
250+
com.azure.spring:spring-cloud-azure-starter-storage;5.20.1;5.21.0-beta.1
251+
com.azure.spring:spring-cloud-azure-starter-storage-blob;5.20.1;5.21.0-beta.1
252+
com.azure.spring:spring-cloud-azure-starter-storage-file-share;5.20.1;5.21.0-beta.1
253+
com.azure.spring:spring-cloud-azure-starter-storage-queue;5.20.1;5.21.0-beta.1
254+
com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;5.20.1;5.21.0-beta.1
255+
com.azure.spring:spring-cloud-azure-starter-integration-servicebus;5.20.1;5.21.0-beta.1
256+
com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;5.20.1;5.21.0-beta.1
257+
com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;5.20.1;5.21.0-beta.1
258+
com.azure.spring:spring-cloud-azure-starter-stream-servicebus;5.20.1;5.21.0-beta.1
259+
com.azure.spring:spring-cloud-azure-starter;5.20.1;5.21.0-beta.1
260+
com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;5.20.1;5.21.0-beta.1
261+
com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;5.20.1;5.21.0-beta.1
262+
com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;5.20.1;5.21.0-beta.1
263+
com.azure.spring:spring-cloud-azure-stream-binder-servicebus;5.20.1;5.21.0-beta.1
264+
com.azure.spring:spring-cloud-azure-testcontainers;5.20.1;5.21.0-beta.1
265+
com.azure:azure-spring-data-cosmos;5.20.1;5.21.0-beta.1
266266
com.azure.resourcemanager:azure-resourcemanager;2.48.0;2.49.0-beta.1
267267
com.azure.resourcemanager:azure-resourcemanager-appplatform;2.48.0;2.49.0-beta.1
268268
com.azure.resourcemanager:azure-resourcemanager-appservice;2.48.0;2.49.0-beta.1

sdk/boms/spring-cloud-azure-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>com.azure</groupId>
5555
<artifactId>azure-sdk-bom</artifactId>
56-
<version>1.2.30</version> <!-- NOTE: This should be updated manually. -->
56+
<version>1.2.31</version> <!-- NOTE: This should be updated manually. -->
5757
<type>pom</type>
5858
<scope>import</scope>
5959
</dependency>

sdk/spring/CHANGELOG.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# Release History
2+
23
## 5.21.0-beta.1 (Unreleased)
34
### Spring Cloud Azure Autoconfigure
45
This section includes changes in `spring-cloud-azure-autoconfigure` module.
56

67
#### Bugs Fixed
78
- Custom `ObjectMapper` bean does not work for received messages. [#37796](https://github.com/Azure/azure-sdk-for-java/issues/37796).
89

9-
## 5.20.0 (2025-02-12)
10+
## 5.20.1 (2025-03-03)
1011
- This release is compatible with Spring Boot 3.4.0-3.4.2, 3.3.0-3.3.6, 3.2.0-3.2.12, 3.1.0-3.1.12, 3.0.0-3.0.13. (Note: 3.4.x (x>2), 3.3.y (y>6) and 3.2.z (z>12) should be supported, but they aren't tested with this release.)
1112
- This release is compatible with Spring Cloud 2024.0.0, 2023.0.0-2023.0.4, 2022.0.0-2022.0.5. (Note: 2024.0.x(x>0) and 2023.0.y (y>4) should be supported, but they aren't tested with this release.)
1213

@@ -15,6 +16,14 @@ This section includes changes in `spring-cloud-azure-autoconfigure` module.
1516
#### Dependency Updates
1617
- Upgrade `azure-sdk-bom` to 1.2.31.
1718

19+
### Azure Spring Data Cosmos
20+
This section includes changes in `azure-spring-data-cosmos` module.
21+
Please refer to [azure-spring-data-cosmos/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/spring/azure-spring-data-cosmos/CHANGELOG.md#5201-2025-03-03) for more details.
22+
23+
## 5.20.0 (2025-02-12)
24+
- This release is compatible with Spring Boot 3.4.0-3.4.2, 3.3.0-3.3.6, 3.2.0-3.2.12, 3.1.0-3.1.12, 3.0.0-3.0.13. (Note: 3.4.x (x>2), 3.3.y (y>6) and 3.2.z (z>12) should be supported, but they aren't tested with this release.)
25+
- This release is compatible with Spring Cloud 2024.0.0, 2023.0.0-2023.0.4, 2022.0.0-2022.0.5. (Note: 2024.0.x(x>0) and 2023.0.y (y>4) should be supported, but they aren't tested with this release.)
26+
1827
### Spring Cloud Azure Autoconfigure
1928
This section includes changes in `spring-cloud-azure-autoconfigure` module.
2029

sdk/spring/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ If you’re a Maven user, add our BOM to your pom.xml `<dependencyManagement>` s
146146
<dependency>
147147
<groupId>com.azure.spring</groupId>
148148
<artifactId>spring-cloud-azure-dependencies</artifactId>
149-
<version>5.20.0</version>
149+
<version>5.20.1</version>
150150
<type>pom</type>
151151
<scope>import</scope>
152152
</dependency>

sdk/spring/azure-spring-data-cosmos/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111

1212
#### Other Changes
1313

14+
### 5.20.1 (2025-03-03)
15+
16+
#### Other Changes
17+
* Upgrade `azure-sdk-bom` to 1.2.31.
18+
1419
### 5.20.0 (2025-02-12)
1520

1621
#### Features Added

sdk/spring/azure-spring-data-cosmos/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ If you are using Maven, add the following dependency.
100100
<dependency>
101101
<groupId>com.azure</groupId>
102102
<artifactId>azure-spring-data-cosmos</artifactId>
103-
<version>5.20.0</version>
103+
<version>5.20.1</version>
104104
</dependency>
105105
```
106106
[//]: # ({x-version-update-end})

sdk/spring/spring-cloud-azure-actuator-autoconfigure/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010

1111
### Other Changes
1212

13+
## 5.20.1 (2025-03-03)
14+
15+
Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#5201-2025-03-03) for more details.
16+
1317
## 5.20.0 (2025-02-12)
1418

1519
Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#5200-2025-02-12) for more details.

sdk/spring/spring-cloud-azure-actuator/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010

1111
### Other Changes
1212

13+
## 5.20.1 (2025-03-03)
14+
15+
Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#5201-2025-03-03) for more details.
16+
1317
## 5.20.0 (2025-02-12)
1418

1519
Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#5200-2025-02-12) for more details.

sdk/spring/spring-cloud-azure-appconfiguration-config-web/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010

1111
### Other Changes
1212

13+
## 5.20.1 (2025-03-03)
14+
15+
Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#5201-2025-03-03) for more details.
16+
1317
## 5.20.0 (2025-02-12)
1418

1519
Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#5200-2025-02-12) for more details.

sdk/spring/spring-cloud-azure-appconfiguration-config/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010

1111
### Other Changes
1212

13+
## 5.20.1 (2025-03-03)
14+
15+
Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#5201-2025-03-03) for more details.
16+
1317
## 5.20.0 (2025-02-12)
1418

1519
Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#5200-2025-02-12) for more details.

0 commit comments

Comments
 (0)