Skip to content

Commit 4ff5824

Browse files
authored
Merge to main after spring cloud azure 5.20.0 released (Azure#44199)
1 parent c386831 commit 4ff5824

File tree

106 files changed

+372
-236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+372
-236
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.19.0;5.20.0-beta.1
213-
com.azure.spring:spring-cloud-azure-appconfiguration-config;5.19.0;5.20.0-beta.1
214-
com.azure.spring:spring-cloud-azure-feature-management-web;5.19.0;5.20.0-beta.1
215-
com.azure.spring:spring-cloud-azure-feature-management;5.19.0;5.20.0-beta.1
216-
com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;5.19.0;5.20.0-beta.1
217-
com.azure.spring:spring-cloud-azure-dependencies;5.19.0;5.20.0-beta.1
218-
com.azure.spring:spring-messaging-azure;5.19.0;5.20.0-beta.1
219-
com.azure.spring:spring-messaging-azure-eventhubs;5.19.0;5.20.0-beta.1
220-
com.azure.spring:spring-messaging-azure-servicebus;5.19.0;5.20.0-beta.1
221-
com.azure.spring:spring-messaging-azure-storage-queue;5.19.0;5.20.0-beta.1
222-
com.azure.spring:spring-integration-azure-core;5.19.0;5.20.0-beta.1
223-
com.azure.spring:spring-integration-azure-eventhubs;5.19.0;5.20.0-beta.1
224-
com.azure.spring:spring-integration-azure-servicebus;5.19.0;5.20.0-beta.1
225-
com.azure.spring:spring-integration-azure-storage-queue;5.19.0;5.20.0-beta.1
226-
com.azure.spring:spring-cloud-azure-core;5.19.0;5.20.0-beta.1
227-
com.azure.spring:spring-cloud-azure-actuator-autoconfigure;5.19.0;5.20.0-beta.1
228-
com.azure.spring:spring-cloud-azure-actuator;5.19.0;5.20.0-beta.1
229-
com.azure.spring:spring-cloud-azure-autoconfigure;5.19.0;5.20.0-beta.1
230-
com.azure.spring:spring-cloud-azure-docker-compose;5.19.0;5.20.0-beta.1
231-
com.azure.spring:spring-cloud-azure-resourcemanager;5.19.0;5.20.0-beta.1
232-
com.azure.spring:spring-cloud-azure-service;5.19.0;5.20.0-beta.1
233-
com.azure.spring:spring-cloud-azure-starter-active-directory;5.19.0;5.20.0-beta.1
234-
com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;5.19.0;5.20.0-beta.1
235-
com.azure.spring:spring-cloud-azure-starter-actuator;5.19.0;5.20.0-beta.1
236-
com.azure.spring:spring-cloud-azure-starter-appconfiguration;5.19.0;5.20.0-beta.1
237-
com.azure.spring:spring-cloud-azure-starter-cosmos;5.19.0;5.20.0-beta.1
238-
com.azure.spring:spring-cloud-azure-starter-data-cosmos;5.19.0;5.20.0-beta.1
239-
com.azure.spring:spring-cloud-azure-starter-data-redis-lettuce;5.19.0;5.20.0-beta.1
240-
com.azure.spring:spring-cloud-azure-starter-eventhubs;5.19.0;5.20.0-beta.1
241-
com.azure.spring:spring-cloud-azure-starter-eventgrid;5.19.0;5.20.0-beta.1
242-
com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;5.19.0;5.20.0-beta.1
243-
com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;5.19.0;5.20.0-beta.1
244-
com.azure.spring:spring-cloud-azure-starter-keyvault;5.19.0;5.20.0-beta.1
245-
com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;5.19.0;5.20.0-beta.1
246-
com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;5.19.0;5.20.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
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.19.0;5.20.0-beta.1
249-
com.azure.spring:spring-cloud-azure-starter-servicebus;5.19.0;5.20.0-beta.1
250-
com.azure.spring:spring-cloud-azure-starter-storage;5.19.0;5.20.0-beta.1
251-
com.azure.spring:spring-cloud-azure-starter-storage-blob;5.19.0;5.20.0-beta.1
252-
com.azure.spring:spring-cloud-azure-starter-storage-file-share;5.19.0;5.20.0-beta.1
253-
com.azure.spring:spring-cloud-azure-starter-storage-queue;5.19.0;5.20.0-beta.1
254-
com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;5.19.0;5.20.0-beta.1
255-
com.azure.spring:spring-cloud-azure-starter-integration-servicebus;5.19.0;5.20.0-beta.1
256-
com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;5.19.0;5.20.0-beta.1
257-
com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;5.19.0;5.20.0-beta.1
258-
com.azure.spring:spring-cloud-azure-starter-stream-servicebus;5.19.0;5.20.0-beta.1
259-
com.azure.spring:spring-cloud-azure-starter;5.19.0;5.20.0-beta.1
260-
com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;5.19.0;5.20.0-beta.1
261-
com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;5.19.0;5.20.0-beta.1
262-
com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;5.19.0;5.20.0-beta.1
263-
com.azure.spring:spring-cloud-azure-stream-binder-servicebus;5.19.0;5.20.0-beta.1
264-
com.azure.spring:spring-cloud-azure-testcontainers;5.19.0;5.20.0-beta.1
265-
com.azure:azure-spring-data-cosmos;5.19.0;5.20.0-beta.1
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
266266
com.azure.resourcemanager:azure-resourcemanager;2.47.0;2.48.0-beta.1
267267
com.azure.resourcemanager:azure-resourcemanager-appplatform;2.47.0;2.48.0-beta.1
268268
com.azure.resourcemanager:azure-resourcemanager-appservice;2.47.0;2.48.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
@@ -6,7 +6,7 @@
66

77
<groupId>com.azure.spring</groupId>
88
<artifactId>spring-cloud-azure-dependencies</artifactId>
9-
<version>5.20.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-dependencies;current} -->
9+
<version>5.21.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-dependencies;current} -->
1010
<packaging>pom</packaging>
1111

1212
<name>Spring Cloud Azure Dependencies</name>

sdk/spring/CHANGELOG.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
# Release History
22

3-
## 5.20.0-beta.1 (Unreleased)
4-
Upgrade Spring Boot dependencies version to 3.4.2 and Spring Cloud dependencies version to 2024.0.0
5-
Upgrade Spring Boot dependencies version to 3.4.1 and Spring Cloud dependencies version to 2024.0.0
3+
## 5.20.0 (2025-02-12)
4+
- 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.)
5+
- 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.)
6+
7+
### Spring Cloud Azure Dependencies (BOM)
8+
9+
#### Dependency Updates
10+
- Upgrade `azure-sdk-bom` to 1.2.31.
611

712
### Spring Cloud Azure Autoconfigure
813
This section includes changes in `spring-cloud-azure-autoconfigure` module.
@@ -17,6 +22,10 @@ This section includes changes in the `spring-messaging-azure-servicebus` module.
1722
#### Bugs Fixed
1823
- Fix bug: The `PropertiesMerger` implementation not handling property `CustomEndpointAddress`. [#43555](https://github.com/Azure/azure-sdk-for-java/issues/43555).
1924

25+
### Azure Spring Data Cosmos
26+
This section includes changes in `azure-spring-data-cosmos` module.
27+
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#5200-2025-02-12) for more details.
28+
2029
## 5.19.0 (2024-12-17)
2130
- This release is compatible with Spring Boot 3.4.0, 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>0), 3.3.y (y>6) and 3.2.z (z>12) should be supported, but they aren't tested with this release.)
2231
- 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.)

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.19.0</version>
149+
<version>5.20.0</version>
150150
<type>pom</type>
151151
<scope>import</scope>
152152
</dependency>

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
## Release History
22

3-
### 5.20.0-beta.1 (Unreleased)
3+
### 5.21.0-beta.1 (Unreleased)
44

55
#### Features Added
6-
* Improved the Exception Handling of 'azure-spring-data-cosmos' to throw more detailed exceptions and not always the same exception - See [PR 42902](https://github.com/Azure/azure-sdk-for-java/pull/42902).
7-
* Implemented sum() support for annotated queries - See [PR 43239](https://github.com/Azure/azure-sdk-for-java/pull/43239).
86

97
#### Breaking Changes
108

119
#### Bugs Fixed
1210

1311
#### Other Changes
1412

13+
### 5.20.0 (2025-02-12)
14+
15+
#### Features Added
16+
* Improved the Exception Handling of 'azure-spring-data-cosmos' to throw more detailed exceptions and not always the same exception - See [PR 42902](https://github.com/Azure/azure-sdk-for-java/pull/42902).
17+
* Implemented sum() support for annotated queries - See [PR 43239](https://github.com/Azure/azure-sdk-for-java/pull/43239).
18+
19+
#### Other Changes
20+
* Updated `azure-cosmos` to version `4.66.0`.
21+
1522
### 5.19.0 (2024-12-17)
1623

1724
#### Bugs Fixed

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.19.0</version>
103+
<version>5.20.0</version>
104104
</dependency>
105105
```
106106
[//]: # ({x-version-update-end})

sdk/spring/azure-spring-data-cosmos/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>com.azure</groupId>
1414
<artifactId>azure-spring-data-cosmos</artifactId>
15-
<version>5.20.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
15+
<version>5.21.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
1616
<packaging>jar</packaging>
1717
<name>Spring Data for Azure Cosmos DB SQL API</name>
1818
<description>Spring Data for Azure Cosmos DB SQL API</description>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Release History
22

3-
## 5.20.0-beta.1 (Unreleased)
3+
## 5.21.0-beta.1 (Unreleased)
44

55
### Features Added
66

@@ -10,6 +10,10 @@
1010

1111
### Other Changes
1212

13+
## 5.20.0 (2025-02-12)
14+
15+
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.
16+
1317
## 5.19.0 (2024-12-17)
1418

1519
Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#5190-2024-12-17) for more details.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Please refer to [spring/README.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/README.md) for more details.

sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>com.azure.spring</groupId>
1414
<artifactId>spring-cloud-azure-actuator-autoconfigure</artifactId>
15-
<version>5.20.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-actuator-autoconfigure;current} -->
15+
<version>5.21.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-actuator-autoconfigure;current} -->
1616

1717
<name>Spring Cloud Azure Actuator AutoConfigure</name>
1818
<description>Spring Cloud Azure Starter Actuator AutoConfigure</description>
@@ -52,17 +52,17 @@
5252
<dependency>
5353
<groupId>com.azure.spring</groupId>
5454
<artifactId>spring-cloud-azure-actuator</artifactId>
55-
<version>5.20.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-actuator;current} -->
55+
<version>5.21.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-actuator;current} -->
5656
</dependency>
5757
<dependency>
5858
<groupId>com.azure.spring</groupId>
5959
<artifactId>spring-cloud-azure-autoconfigure</artifactId>
60-
<version>5.20.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-autoconfigure;current} -->
60+
<version>5.21.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-autoconfigure;current} -->
6161
</dependency>
6262
<dependency>
6363
<groupId>com.azure.spring</groupId>
6464
<artifactId>spring-cloud-azure-appconfiguration-config-web</artifactId>
65-
<version>5.20.0-beta.1</version><!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config-web;current} -->
65+
<version>5.21.0-beta.1</version><!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config-web;current} -->
6666
<optional>true</optional>
6767
</dependency>
6868

0 commit comments

Comments
 (0)