Merge branch 'release/spring-cloud-azure_6.1.0' into myr/merge610

Author: Netyyyy

eng/versioning/version_client.txt

@@ -215,61 +215,61 @@ com.microsoft.azure:azure-batch;11.2.0;11.3.0-beta.1
 com.microsoft.azure:azure-eventhubs;3.3.0;3.4.0-beta.1
 com.microsoft.azure:azure-servicebus;3.6.7;3.7.0-beta.1
 com.azure.spring:azure-monitor-spring-native-test;1.0.0-beta.1;1.0.0-beta.1
-com.azure.spring:spring-cloud-azure-appconfiguration-config-web;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-appconfiguration-config;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-feature-management-web;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-feature-management;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-dependencies;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-messaging-azure;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-messaging-azure-eventhubs;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-messaging-azure-servicebus;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-messaging-azure-storage-queue;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-integration-azure-core;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-integration-azure-eventhubs;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-integration-azure-servicebus;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-integration-azure-storage-queue;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-core;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-actuator-autoconfigure;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-actuator;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-autoconfigure;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-docker-compose;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-resourcemanager;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-service;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-active-directory;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-actuator;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-appconfiguration;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-cosmos;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-data-cosmos;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-data-redis-lettuce;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-eventhubs;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-eventgrid;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault-jca;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-monitor;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-servicebus-jms;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-servicebus;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage-blob;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage-file-share;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage-queue;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-integration-servicebus;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-stream-servicebus;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-starter;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-servicebus;6.0.0;6.1.0-beta.1
-com.azure.spring:spring-cloud-azure-testcontainers;6.0.0;6.1.0-beta.1
-com.azure:azure-spring-data-cosmos;6.0.0;6.1.0-beta.1
+com.azure.spring:spring-cloud-azure-appconfiguration-config-web;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-appconfiguration-config;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-feature-management-web;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-feature-management;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-dependencies;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-messaging-azure;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-messaging-azure-eventhubs;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-messaging-azure-servicebus;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-messaging-azure-storage-queue;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-integration-azure-core;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-integration-azure-eventhubs;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-integration-azure-servicebus;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-integration-azure-storage-queue;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-core;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-actuator-autoconfigure;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-actuator;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-autoconfigure;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-docker-compose;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-resourcemanager;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-service;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-active-directory;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-actuator;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-appconfiguration;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-cosmos;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-data-cosmos;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-data-redis-lettuce;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-eventhubs;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-eventgrid;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-keyvault;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-keyvault-jca;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-monitor;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-servicebus-jms;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-servicebus;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-storage;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-storage-blob;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-storage-file-share;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-storage-queue;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-integration-servicebus;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-stream-servicebus;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-starter;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-stream-binder-servicebus;6.1.0;6.2.0-beta.1
+com.azure.spring:spring-cloud-azure-testcontainers;6.1.0;6.2.0-beta.1
+com.azure:azure-spring-data-cosmos;6.1.0;6.2.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager;2.57.0;2.58.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-appplatform;2.51.0;2.52.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-appservice;2.54.1;2.55.0-beta.1

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

@@ -6,7 +6,7 @@
 
   <groupId>com.azure.spring</groupId>
   <artifactId>spring-cloud-azure-dependencies</artifactId>
-  <version>6.1.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-dependencies;current} -->
+  <version>6.2.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-dependencies;current} -->
   <packaging>pom</packaging>
 
   <name>Spring Cloud Azure Dependencies</name>
@@ -53,7 +53,7 @@
       <dependency>
         <groupId>com.azure</groupId>
         <artifactId>azure-sdk-bom</artifactId>
-        <version>1.2.38</version>   <!-- NOTE: This should be updated manually. -->
+        <version>1.3.3</version>   <!-- NOTE: This should be updated manually. -->
         <type>pom</type>
         <scope>import</scope>
       </dependency>

sdk/spring/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Release History
 
-## 6.1.0 (Not released)
+## 6.1.0 (2025-12-16)
+- 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.)
+- 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.)
+
+### Spring Cloud Azure Dependencies (BOM)
+
+#### Dependency Updates
+- Upgrade `azure-sdk-bom` to 1.3.3.
+- Upgrade `azure-servicebus-jms` to 2.1.0.
 
 ### Spring Cloud Azure Autoconfigure
 This section includes changes in `spring-cloud-azure-autoconfigure` module.
@@ -13,6 +21,18 @@ This section includes changes in `spring-cloud-azure-autoconfigure` module.
 
 - 2 `TokenCredential` bean found in AzureServiceBusMessagingAutoConfiguration. [#47470](https://github.com/Azure/azure-sdk-for-java/pull/47470)
 - `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)
+- Fix bug: 'token-credential-bean-name' not work in spring-cloud-azure-stream-binder. [#47557](https://github.com/Azure/azure-sdk-for-java/pull/47557)
+
+### Spring Cloud Azure Appconfiguration Config
+This section includes changes in `spring-cloud-azure-appconfiguration-config` module.
+
+#### Bugs Fixed
+
+- Fixed bug where `spring.cloud.azure.appconfiguration.enabled=false` was ignored in the new major version. [#47029](https://github.com/Azure/azure-sdk-for-java/pull/47029)
+
+### Azure Spring Data Cosmos
+This section includes changes in `azure-spring-data-cosmos` module.
+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-16) for more details.
 
 ## 5.24.1 (2025-12-09)
 - 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.)

sdk/spring/README.md

@@ -146,7 +146,7 @@ If you’re a Maven user, add our BOM to your pom.xml `<dependencyManagement>` s
         <dependency>
             <groupId>com.azure.spring</groupId>
             <artifactId>spring-cloud-azure-dependencies</artifactId>
-            <version>6.0.0</version>
+            <version>6.1.0</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

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

@@ -1,6 +1,6 @@
 ## Release History
 
-### 6.1.0-beta.1 (Unreleased)
+### 6.2.0-beta.1 (Unreleased)
 
 #### Features Added
 
@@ -10,6 +10,11 @@
 
 #### Other Changes
 
+### 6.1.0 (2025-12-16)
+
+#### Other Changes
+* regular release
+
 ### 5.24.1 (2025-12-09)
 
 #### Other Changes

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

@@ -100,7 +100,7 @@ If you are using Maven, add the following dependency.
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-spring-data-cosmos</artifactId>
-    <version>6.0.0</version>
+    <version>6.1.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

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

@@ -12,7 +12,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-spring-data-cosmos</artifactId>
-  <version>6.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+  <version>6.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
   <packaging>jar</packaging>
   <name>Spring Data for Azure Cosmos DB SQL API</name>
   <description>Spring Data for Azure Cosmos DB SQL API</description>

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

@@ -1,6 +1,6 @@
 # Release History
 
-## 6.1.0-beta.1 (Unreleased)
+## 6.2.0-beta.1 (Unreleased)
 
 ### Features Added
 
@@ -10,6 +10,10 @@
 
 ### Other Changes
 
+## 6.1.0 (2025-12-16)
+
+Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#610-2025-12-16) for more details.
+
 ## 6.0.0 (2025-09-22)
 
 Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#600-2025-09-22) for more details.

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

@@ -12,7 +12,7 @@
 
   <groupId>com.azure.spring</groupId>
   <artifactId>spring-cloud-azure-actuator-autoconfigure</artifactId>
-  <version>6.1.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-actuator-autoconfigure;current} -->
+  <version>6.2.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-actuator-autoconfigure;current} -->
 
   <name>Spring Cloud Azure Actuator AutoConfigure</name>
   <description>Spring Cloud Azure Starter Actuator AutoConfigure</description>
@@ -52,17 +52,17 @@
     <dependency>
       <groupId>com.azure.spring</groupId>
       <artifactId>spring-cloud-azure-actuator</artifactId>
-      <version>6.1.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-actuator;current} -->
+      <version>6.2.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-actuator;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.spring</groupId>
       <artifactId>spring-cloud-azure-autoconfigure</artifactId>
-      <version>6.1.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-autoconfigure;current} -->
+      <version>6.2.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-autoconfigure;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.spring</groupId>
       <artifactId>spring-cloud-azure-appconfiguration-config-web</artifactId>
-      <version>6.1.0-beta.1</version><!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config-web;current} -->
+      <version>6.2.0-beta.1</version><!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config-web;current} -->
       <optional>true</optional>
     </dependency>
 

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

@@ -1,6 +1,6 @@
 # Release History
 
-## 6.1.0-beta.1 (Unreleased)
+## 6.2.0-beta.1 (Unreleased)
 
 ### Features Added
 
@@ -10,6 +10,10 @@
 
 ### Other Changes
 
+## 6.1.0 (2025-12-16)
+
+Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#610-2025-12-16) for more details.
+
 ## 6.0.0 (2025-09-22)
 
 Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#600-2025-09-22) for more details.