Merge to main after spring cloud azure 5.22.0 released (Azure#44954)

* Add request-reply pattern of ServiceBusTemplate  (Azure#44859)

(cherry picked from commit bd0e04e)

* Remove unused files that are legacy files from 4.x (Azure#44872)

(cherry picked from commit f6d8d81)

* External dependencies upgrade - Spring Boot 3.4.4 and Spring Cloud 2024.0.1 (Azure#44777)

* Upgrade external dependencies to align with Spring Boot 3.4.4

* update cspell

---------

Co-authored-by: github-actions <github-actions@github.com>
(cherry picked from commit df99696)

* Prepare for Spring Cloud Azure 5.22.0 release (Azure#44907)

* update version client

* update others

* update changelog

* Use consistent names from producer factory (Azure#44918)

* Use consistent names for consumer listener (Azure#44927)

* Make the conditions more accurate for JMS pool conn bean (Azure#44937)

* Increment package versions for spring releases (Azure#44942)

---------

Co-authored-by: Moary Chen <v-shilichen@microsoft.com>
Co-authored-by: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>

Author: 3 people

eng/versioning/version_client.txt

@@ -201,61 +201,61 @@ com.azure:identity-test-vm;1.0.0-beta.1;1.0.0-beta.1
 com.azure:identity-test-webapp;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-ai-vision-face;1.0.0-beta.2;1.0.0-beta.3
 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;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-appconfiguration-config;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-feature-management-web;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-feature-management;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-dependencies;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-messaging-azure;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-messaging-azure-eventhubs;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-messaging-azure-servicebus;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-messaging-azure-storage-queue;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-integration-azure-core;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-integration-azure-eventhubs;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-integration-azure-servicebus;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-integration-azure-storage-queue;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-core;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-actuator-autoconfigure;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-actuator;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-autoconfigure;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-docker-compose;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-resourcemanager;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-service;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-active-directory;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-actuator;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-appconfiguration;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-cosmos;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-data-cosmos;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-data-redis-lettuce;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-eventhubs;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-eventgrid;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault-jca;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-monitor;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-servicebus-jms;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-servicebus;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage-blob;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage-file-share;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage-queue;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-integration-servicebus;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-stream-servicebus;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-starter;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-servicebus;5.21.0;5.22.0-beta.1
-com.azure.spring:spring-cloud-azure-testcontainers;5.21.0;5.22.0-beta.1
-com.azure:azure-spring-data-cosmos;5.21.0;5.22.0-beta.1
+com.azure.spring:spring-cloud-azure-appconfiguration-config-web;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-appconfiguration-config;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-feature-management-web;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-feature-management;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-dependencies;5.21.0;5.22.0
+com.azure.spring:spring-messaging-azure;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-messaging-azure-eventhubs;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-messaging-azure-servicebus;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-messaging-azure-storage-queue;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-integration-azure-core;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-integration-azure-eventhubs;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-integration-azure-servicebus;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-integration-azure-storage-queue;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-core;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-actuator-autoconfigure;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-actuator;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-autoconfigure;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-docker-compose;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-resourcemanager;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-service;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-active-directory;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-actuator;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-appconfiguration;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-cosmos;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-data-cosmos;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-data-redis-lettuce;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-eventhubs;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-eventgrid;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-keyvault;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-keyvault-jca;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-monitor;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-servicebus-jms;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-servicebus;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-storage;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-storage-blob;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-storage-file-share;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-storage-queue;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-integration-servicebus;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-stream-servicebus;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-starter;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-stream-binder-servicebus;5.22.0;5.23.0-beta.1
+com.azure.spring:spring-cloud-azure-testcontainers;5.22.0;5.23.0-beta.1
+com.azure:azure-spring-data-cosmos;5.22.0;5.23.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager;2.49.0;2.50.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-appplatform;2.49.0;2.50.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-appservice;2.49.0;2.50.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>5.22.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-dependencies;current} -->
+  <version>5.22.0</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.32</version>   <!-- NOTE: This should be updated manually. -->
+        <version>1.2.33</version>   <!-- NOTE: This should be updated manually. -->
         <type>pom</type>
         <scope>import</scope>
       </dependency>

sdk/spring/CHANGELOG.md

@@ -16,6 +16,31 @@ This section includes changes in the `spring-messaging-azure-servicebus` module.
 #### Features Added
 - `ServiceBusTemplate` supports request-reply pattern.
 
+## 5.22.0 (2025-04-08)
+- This release is compatible with Spring Boot 3.4.0-3.4.4, 3.3.0-3.3.10, 3.2.0-3.2.12, 3.1.0-3.1.12, 3.0.0-3.0.13. (Note: 3.4.x (x>4), 3.3.y (y>10) and 3.2.z (z>12) should be supported, but they aren't tested with this release.)
+- This release is compatible with Spring Cloud 2024.0.1, 2023.0.0-2023.0.5, 2022.0.0-2022.0.5. (Note: 2024.0.x(x>1) and 2023.0.y (y>5) should be supported, but they aren't tested with this release.)
+
+### Spring Cloud Azure Dependencies (BOM)
+
+#### Dependency Updates
+- Upgrade `azure-sdk-bom` to 1.2.33.
+
+### Spring Cloud Azure Autoconfigure
+This section includes changes in `spring-cloud-azure-autoconfigure` module.
+
+#### Features Added
+- Register a new bean `ServiceBusConsumerFactory` to support request-reply pattern of `ServiceBusTemplate`.
+
+### Spring Messaging Azure Service Bus
+This section includes changes in the `spring-messaging-azure-servicebus` module.
+
+#### Features Added
+- `ServiceBusTemplate` supports request-reply pattern.
+
+### 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#5220-2025-04-08) for more details.
+
 ## 5.21.0 (2025-03-20)
 - 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.)
 - 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

@@ -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>5.21.0</version>
+            <version>5.22.0</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

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

@@ -1,15 +1,22 @@
 ## Release History
 
-### 5.22.0-beta.1 (Unreleased)
+### 5.23.0-beta.1 (Unreleased)
 
 #### Features Added
 
 #### Breaking Changes
 
+#### Bugs Fixed
+
+#### Other Changes
+
+### 5.22.0 (2025-04-08)
+
 #### Bugs Fixed
 * Fixing bug when the PartitionKey is on a parent entity that was introduced when bulk support was added - See [PR 43801](https://github.com/Azure/azure-sdk-for-java/pull/43801).
 
 #### Other Changes
+* Updated `azure-cosmos` to version `4.68.0`.
 
 ### 5.21.0 (2025-03-20)
 

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>5.21.0</version>
+    <version>5.22.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>5.22.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+  <version>5.23.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
 
-## 5.22.0-beta.1 (Unreleased)
+## 5.23.0-beta.1 (Unreleased)
 
 ### Features Added
 
@@ -10,6 +10,10 @@
 
 ### Other Changes
 
+## 5.22.0 (2025-04-08)
+
+Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#5220-2025-04-08) for more details.
+
 ## 5.21.0 (2025-03-20)
 
 Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#5210-2025-03-20) 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>5.22.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-actuator-autoconfigure;current} -->
+  <version>5.23.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>5.22.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-actuator;current} -->
+      <version>5.23.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>5.22.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-autoconfigure;current} -->
+      <version>5.23.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>5.22.0-beta.1</version><!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config-web;current} -->
+      <version>5.23.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
 
-## 5.22.0-beta.1 (Unreleased)
+## 5.23.0-beta.1 (Unreleased)
 
 ### Features Added
 
@@ -10,6 +10,10 @@
 
 ### Other Changes
 
+## 5.22.0 (2025-04-08)
+
+Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#5220-2025-04-08) for more details.
+
 ## 5.21.0 (2025-03-20)
 
 Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#5210-2025-03-20) for more details.