Skip to content

Commit 90bcde2

Browse files
CopilotNetyyyy
andcommitted
Prepare for Spring Cloud Azure 6.1.0 release
- Update version_client.txt versions from 6.1.0-beta.1 to 6.1.0 for all Spring modules - Run update_versions.py to update pom.xml files - Revert unrelated file changes outside sdk/spring and sdk/boms/spring-cloud-azure-dependencies - Update azure-sdk-bom version to 1.3.3 in spring-cloud-azure-dependencies/pom.xml - Update sdk/spring/CHANGELOG.md with: - Release date 2025-12-15 - Compatibility notes for Spring Boot 3.5.0-3.5.8 and Spring Cloud 2025.0.0 - BOM section with azure-sdk-bom upgrade to 1.3.3 - Aggregated bug fixes from individual module CHANGELOGs - Azure Spring Data Cosmos section reference - Update sdk/spring/azure-spring-data-cosmos/CHANGELOG.md with release date - Update all other sdk/spring/xxx/CHANGELOG.md files to reference main CHANGELOG Co-authored-by: Netyyyy <[email protected]>
1 parent 1aae53d commit 90bcde2

File tree

90 files changed

+286
-431
lines changed

Some content is hidden

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

90 files changed

+286
-431
lines changed

eng/versioning/version_client.txt

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -215,61 +215,61 @@ com.microsoft.azure:azure-batch;11.2.0;11.3.0-beta.1
215215
com.microsoft.azure:azure-eventhubs;3.3.0;3.4.0-beta.1
216216
com.microsoft.azure:azure-servicebus;3.6.7;3.7.0-beta.1
217217
com.azure.spring:azure-monitor-spring-native-test;1.0.0-beta.1;1.0.0-beta.1
218-
com.azure.spring:spring-cloud-azure-appconfiguration-config-web;6.0.0;6.1.0-beta.1
219-
com.azure.spring:spring-cloud-azure-appconfiguration-config;6.0.0;6.1.0-beta.1
220-
com.azure.spring:spring-cloud-azure-feature-management-web;6.0.0;6.1.0-beta.1
221-
com.azure.spring:spring-cloud-azure-feature-management;6.0.0;6.1.0-beta.1
222-
com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;6.0.0;6.1.0-beta.1
223-
com.azure.spring:spring-cloud-azure-dependencies;6.0.0;6.1.0-beta.1
224-
com.azure.spring:spring-messaging-azure;6.0.0;6.1.0-beta.1
225-
com.azure.spring:spring-messaging-azure-eventhubs;6.0.0;6.1.0-beta.1
226-
com.azure.spring:spring-messaging-azure-servicebus;6.0.0;6.1.0-beta.1
227-
com.azure.spring:spring-messaging-azure-storage-queue;6.0.0;6.1.0-beta.1
228-
com.azure.spring:spring-integration-azure-core;6.0.0;6.1.0-beta.1
229-
com.azure.spring:spring-integration-azure-eventhubs;6.0.0;6.1.0-beta.1
230-
com.azure.spring:spring-integration-azure-servicebus;6.0.0;6.1.0-beta.1
231-
com.azure.spring:spring-integration-azure-storage-queue;6.0.0;6.1.0-beta.1
232-
com.azure.spring:spring-cloud-azure-core;6.0.0;6.1.0-beta.1
233-
com.azure.spring:spring-cloud-azure-actuator-autoconfigure;6.0.0;6.1.0-beta.1
234-
com.azure.spring:spring-cloud-azure-actuator;6.0.0;6.1.0-beta.1
235-
com.azure.spring:spring-cloud-azure-autoconfigure;6.0.0;6.1.0-beta.1
236-
com.azure.spring:spring-cloud-azure-docker-compose;6.0.0;6.1.0-beta.1
237-
com.azure.spring:spring-cloud-azure-resourcemanager;6.0.0;6.1.0-beta.1
238-
com.azure.spring:spring-cloud-azure-service;6.0.0;6.1.0-beta.1
239-
com.azure.spring:spring-cloud-azure-starter-active-directory;6.0.0;6.1.0-beta.1
240-
com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;6.0.0;6.1.0-beta.1
241-
com.azure.spring:spring-cloud-azure-starter-actuator;6.0.0;6.1.0-beta.1
242-
com.azure.spring:spring-cloud-azure-starter-appconfiguration;6.0.0;6.1.0-beta.1
243-
com.azure.spring:spring-cloud-azure-starter-cosmos;6.0.0;6.1.0-beta.1
244-
com.azure.spring:spring-cloud-azure-starter-data-cosmos;6.0.0;6.1.0-beta.1
245-
com.azure.spring:spring-cloud-azure-starter-data-redis-lettuce;6.0.0;6.1.0-beta.1
246-
com.azure.spring:spring-cloud-azure-starter-eventhubs;6.0.0;6.1.0-beta.1
247-
com.azure.spring:spring-cloud-azure-starter-eventgrid;6.0.0;6.1.0-beta.1
248-
com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;6.0.0;6.1.0-beta.1
249-
com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;6.0.0;6.1.0-beta.1
250-
com.azure.spring:spring-cloud-azure-starter-keyvault;6.0.0;6.1.0-beta.1
251-
com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;6.0.0;6.1.0-beta.1
252-
com.azure.spring:spring-cloud-azure-starter-keyvault-jca;6.0.0;6.1.0-beta.1
253-
com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;6.0.0;6.1.0-beta.1
254-
com.azure.spring:spring-cloud-azure-starter-monitor;6.0.0;6.1.0-beta.1
255-
com.azure.spring:spring-cloud-azure-starter-servicebus-jms;6.0.0;6.1.0-beta.1
256-
com.azure.spring:spring-cloud-azure-starter-servicebus;6.0.0;6.1.0-beta.1
257-
com.azure.spring:spring-cloud-azure-starter-storage;6.0.0;6.1.0-beta.1
258-
com.azure.spring:spring-cloud-azure-starter-storage-blob;6.0.0;6.1.0-beta.1
259-
com.azure.spring:spring-cloud-azure-starter-storage-file-share;6.0.0;6.1.0-beta.1
260-
com.azure.spring:spring-cloud-azure-starter-storage-queue;6.0.0;6.1.0-beta.1
261-
com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;6.0.0;6.1.0-beta.1
262-
com.azure.spring:spring-cloud-azure-starter-integration-servicebus;6.0.0;6.1.0-beta.1
263-
com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;6.0.0;6.1.0-beta.1
264-
com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;6.0.0;6.1.0-beta.1
265-
com.azure.spring:spring-cloud-azure-starter-stream-servicebus;6.0.0;6.1.0-beta.1
266-
com.azure.spring:spring-cloud-azure-starter;6.0.0;6.1.0-beta.1
267-
com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;6.0.0;6.1.0-beta.1
268-
com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;6.0.0;6.1.0-beta.1
269-
com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;6.0.0;6.1.0-beta.1
270-
com.azure.spring:spring-cloud-azure-stream-binder-servicebus;6.0.0;6.1.0-beta.1
271-
com.azure.spring:spring-cloud-azure-testcontainers;6.0.0;6.1.0-beta.1
272-
com.azure:azure-spring-data-cosmos;6.0.0;6.1.0-beta.1
218+
com.azure.spring:spring-cloud-azure-appconfiguration-config-web;6.0.0;6.1.0
219+
com.azure.spring:spring-cloud-azure-appconfiguration-config;6.0.0;6.1.0
220+
com.azure.spring:spring-cloud-azure-feature-management-web;6.0.0;6.1.0
221+
com.azure.spring:spring-cloud-azure-feature-management;6.0.0;6.1.0
222+
com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;6.0.0;6.1.0
223+
com.azure.spring:spring-cloud-azure-dependencies;6.0.0;6.1.0
224+
com.azure.spring:spring-messaging-azure;6.0.0;6.1.0
225+
com.azure.spring:spring-messaging-azure-eventhubs;6.0.0;6.1.0
226+
com.azure.spring:spring-messaging-azure-servicebus;6.0.0;6.1.0
227+
com.azure.spring:spring-messaging-azure-storage-queue;6.0.0;6.1.0
228+
com.azure.spring:spring-integration-azure-core;6.0.0;6.1.0
229+
com.azure.spring:spring-integration-azure-eventhubs;6.0.0;6.1.0
230+
com.azure.spring:spring-integration-azure-servicebus;6.0.0;6.1.0
231+
com.azure.spring:spring-integration-azure-storage-queue;6.0.0;6.1.0
232+
com.azure.spring:spring-cloud-azure-core;6.0.0;6.1.0
233+
com.azure.spring:spring-cloud-azure-actuator-autoconfigure;6.0.0;6.1.0
234+
com.azure.spring:spring-cloud-azure-actuator;6.0.0;6.1.0
235+
com.azure.spring:spring-cloud-azure-autoconfigure;6.0.0;6.1.0
236+
com.azure.spring:spring-cloud-azure-docker-compose;6.0.0;6.1.0
237+
com.azure.spring:spring-cloud-azure-resourcemanager;6.0.0;6.1.0
238+
com.azure.spring:spring-cloud-azure-service;6.0.0;6.1.0
239+
com.azure.spring:spring-cloud-azure-starter-active-directory;6.0.0;6.1.0
240+
com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;6.0.0;6.1.0
241+
com.azure.spring:spring-cloud-azure-starter-actuator;6.0.0;6.1.0
242+
com.azure.spring:spring-cloud-azure-starter-appconfiguration;6.0.0;6.1.0
243+
com.azure.spring:spring-cloud-azure-starter-cosmos;6.0.0;6.1.0
244+
com.azure.spring:spring-cloud-azure-starter-data-cosmos;6.0.0;6.1.0
245+
com.azure.spring:spring-cloud-azure-starter-data-redis-lettuce;6.0.0;6.1.0
246+
com.azure.spring:spring-cloud-azure-starter-eventhubs;6.0.0;6.1.0
247+
com.azure.spring:spring-cloud-azure-starter-eventgrid;6.0.0;6.1.0
248+
com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;6.0.0;6.1.0
249+
com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;6.0.0;6.1.0
250+
com.azure.spring:spring-cloud-azure-starter-keyvault;6.0.0;6.1.0
251+
com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;6.0.0;6.1.0
252+
com.azure.spring:spring-cloud-azure-starter-keyvault-jca;6.0.0;6.1.0
253+
com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;6.0.0;6.1.0
254+
com.azure.spring:spring-cloud-azure-starter-monitor;6.0.0;6.1.0
255+
com.azure.spring:spring-cloud-azure-starter-servicebus-jms;6.0.0;6.1.0
256+
com.azure.spring:spring-cloud-azure-starter-servicebus;6.0.0;6.1.0
257+
com.azure.spring:spring-cloud-azure-starter-storage;6.0.0;6.1.0
258+
com.azure.spring:spring-cloud-azure-starter-storage-blob;6.0.0;6.1.0
259+
com.azure.spring:spring-cloud-azure-starter-storage-file-share;6.0.0;6.1.0
260+
com.azure.spring:spring-cloud-azure-starter-storage-queue;6.0.0;6.1.0
261+
com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;6.0.0;6.1.0
262+
com.azure.spring:spring-cloud-azure-starter-integration-servicebus;6.0.0;6.1.0
263+
com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;6.0.0;6.1.0
264+
com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;6.0.0;6.1.0
265+
com.azure.spring:spring-cloud-azure-starter-stream-servicebus;6.0.0;6.1.0
266+
com.azure.spring:spring-cloud-azure-starter;6.0.0;6.1.0
267+
com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;6.0.0;6.1.0
268+
com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;6.0.0;6.1.0
269+
com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;6.0.0;6.1.0
270+
com.azure.spring:spring-cloud-azure-stream-binder-servicebus;6.0.0;6.1.0
271+
com.azure.spring:spring-cloud-azure-testcontainers;6.0.0;6.1.0
272+
com.azure:azure-spring-data-cosmos;6.0.0;6.1.0
273273
com.azure.resourcemanager:azure-resourcemanager;2.57.0;2.58.0-beta.1
274274
com.azure.resourcemanager:azure-resourcemanager-appplatform;2.51.0;2.52.0-beta.1
275275
com.azure.resourcemanager:azure-resourcemanager-appservice;2.54.1;2.55.0-beta.1

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

Lines changed: 2 additions & 2 deletions
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>6.1.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-dependencies;current} -->
9+
<version>6.1.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-dependencies;current} -->
1010
<packaging>pom</packaging>
1111

1212
<name>Spring Cloud Azure Dependencies</name>
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>com.azure</groupId>
5555
<artifactId>azure-sdk-bom</artifactId>
56-
<version>1.2.38</version> <!-- NOTE: This should be updated manually. -->
56+
<version>1.3.3</version> <!-- NOTE: This should be updated manually. -->
5757
<type>pom</type>
5858
<scope>import</scope>
5959
</dependency>

sdk/spring/CHANGELOG.md

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

3-
## 6.1.0 (Not released)
3+
## 6.1.0 (2025-12-15)
4+
- This release is compatible with Spring Boot 3.5.0-3.5.8. (Note: 3.5.x (x>8) should be supported, but they aren't tested with this release.)
5+
- This release is compatible with Spring Cloud 2025.0.0. (Note: 2025.0.x (x>0) 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.3.3.
411

512
### Spring Cloud Azure Autoconfigure
613
This section includes changes in `spring-cloud-azure-autoconfigure` module.
@@ -10,6 +17,17 @@ This section includes changes in `spring-cloud-azure-autoconfigure` module.
1017
- 2 `TokenCredential` bean found in AzureServiceBusMessagingAutoConfiguration. [#47470](https://github.com/Azure/azure-sdk-for-java/pull/47470)
1118
- `spring.cloud.azure.eventhubs.credential.token-credential-bean-name` not take effect in AzureEventHubsMessagingAutoConfiguration. [#47470](https://github.com/Azure/azure-sdk-for-java/pull/47470)
1219

20+
### Spring Cloud Azure Appconfiguration Config
21+
This section includes changes in `spring-cloud-azure-appconfiguration-config` module.
22+
23+
#### Bugs Fixed
24+
25+
- Fixed bug where `spring.cloud.azure.appconfiguration.enabled=false` was ignored in the new major version.
26+
27+
### Azure Spring Data Cosmos
28+
This section includes changes in `azure-spring-data-cosmos` module.
29+
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#610-2025-12-15) for more details.
30+
1331
## 5.24.1 (2025-12-09)
1432
- This release is compatible with Spring Boot 3.5.0-3.5.8, 3.4.0-3.4.12, 3.3.0-3.3.13, 3.2.0-3.2.12, 3.1.0-3.1.12, 3.0.0-3.0.13. (Note: 3.5.x (x>8) and 3.4.y (y>12) should be supported, but they aren't tested with this release.)
1533
- This release is compatible with Spring Cloud 2025.0.0, 2024.0.0-2024.0.2, 2023.0.0-2023.0.5, 2022.0.0-2022.0.5. (Note: 2025.0.x(x>0) and 2024.0.y (y>2) 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>6.0.0</version>
149+
<version>6.1.0</version>
150150
<type>pom</type>
151151
<scope>import</scope>
152152
</dependency>

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
## Release History
22

3-
### 6.1.0-beta.1 (Unreleased)
4-
5-
#### Features Added
6-
7-
#### Breaking Changes
8-
9-
#### Bugs Fixed
3+
### 6.1.0 (2025-12-15)
104

115
#### Other Changes
6+
* regular release
127

138
### 5.24.1 (2025-12-09)
149

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>6.0.0</version>
103+
<version>6.1.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>6.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
15+
<version>6.1.0</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: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
# Release History
22

3-
## 6.1.0-beta.1 (Unreleased)
3+
## 6.1.0 (2025-12-15)
44

5-
### Features Added
6-
7-
### Breaking Changes
8-
9-
### Bugs Fixed
10-
11-
### Other Changes
5+
Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#610-2025-12-15) for more details.
126

137
## 6.0.0 (2025-09-22)
148

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>6.1.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-actuator-autoconfigure;current} -->
15+
<version>6.1.0</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>6.1.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-actuator;current} -->
55+
<version>6.1.0</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>6.1.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-autoconfigure;current} -->
60+
<version>6.1.0</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>6.1.0-beta.1</version><!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config-web;current} -->
65+
<version>6.1.0</version><!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config-web;current} -->
6666
<optional>true</optional>
6767
</dependency>
6868

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

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

3-
## 6.1.0-beta.1 (Unreleased)
3+
## 6.1.0 (2025-12-15)
44

5-
### Features Added
6-
7-
### Breaking Changes
8-
9-
### Bugs Fixed
10-
11-
### Other Changes
5+
Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#610-2025-12-15) for more details.
126

137
## 6.0.0 (2025-09-22)
148

0 commit comments

Comments
 (0)