Skip to content

Commit 88b3dd2

Browse files
committed
update comments
1 parent c9f1924 commit 88b3dd2

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

sdk/spring/README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
> [!WARNING]
2-
> [Spring Cloud Azure 4.19.0](https://github.com/Azure/azure-sdk-for-java/tree/spring-cloud-azure_4.19.0) is the final release in the 4.x series. We will continue to provide support for this version until June 2025. After June 2025 we will stop all support for Spring Cloud Azure 4.x
2+
> [Spring Cloud Azure 4.20.0](https://github.com/Azure/azure-sdk-for-java/tree/spring-cloud-azure_4.20.0) is the final release in the 4.x series. We will continue to provide support for this version until June 2025. After June 2025 we will stop all support for Spring Cloud Azure 4.x
33
44

55
> [!NOTE]
6-
> Spring Cloud Azure 5.x now fully supports Spring Boot 3.3.0 and later versions, we strongly encourage you to upgrade. For more information, please refer to [Which Version of Spring Cloud Azure Should I Use](https://github.com/Azure/azure-sdk-for-java/wiki/Spring-Versions-Mapping#which-version-of-spring-cloud-azure-should-i-use).
6+
> Spring Cloud Azure 5.x is fully aligned with Spring Boot 3.x, version 6.x supports Spring Boot 3.5.x, and version 7.x is designed for Spring Boot 4. To take advantage of the latest features, performance improvements, and security updates, we strongly recommend upgrading. For more information, please refer to [Which Version of Spring Cloud Azure Should I Use](https://github.com/Azure/azure-sdk-for-java/wiki/Spring-Versions-Mapping#which-version-of-spring-cloud-azure-should-i-use).
77
88
# Spring Cloud Azure
99

@@ -72,7 +72,7 @@ This module contains the auto-configuration code for Azure services.
7272

7373
### spring-cloud-azure-starters
7474

75-
Spring Cloud Azure Starters are a set of convenient dependency descriptors to include in your application. It boosts your Spring Boot application developement with Azure services. For example, if you want to get started using Spring and Azure Cosmos DB for data persistence, include the `spring-cloud-azure-starter-cosmos` dependency in your project.
75+
Spring Cloud Azure Starters are a set of convenient dependency descriptors to include in your application. It boosts your Spring Boot application development with Azure services. For example, if you want to get started using Spring and Azure Cosmos DB for data persistence, include the `spring-cloud-azure-starter-cosmos` dependency in your project.
7676

7777
The following application starters are provided by Spring Cloud Azure under the `com.azure.spring` group:
7878

@@ -120,7 +120,7 @@ This provides auto-configuration for actuator endpoints based on the content of
120120

121121
Spring Integration Extension for Azure provides Spring Integration adapters for the various services provided by the [Azure SDK for Java](https://github.com/Azure/azure-sdk-for-java/). Below is a list of supported adapters:
122122

123-
- spring-integration-azure-eventhbus
123+
- spring-integration-azure-eventhubs
124124
- spring-integration-azure-servicebus
125125
- spring-integration-azure-storage-queue
126126

@@ -226,6 +226,10 @@ You have to create a `custom.security file` in `src/main/resources` with the fol
226226
jdk.jar.disabledAlgorithms=MD2, MD5, RSA, DSA
227227
```
228228

229+
## Spring Boot 4 Support
230+
231+
The source code of Spring Cloud Azure for Spring Boot 4.x can be found on the [feature/springcloudazure-7.x](https://github.com/Azure/azure-sdk-for-java/tree/feature/springcloudazure-7.x) branch.
232+
229233
## Contributing
230234
This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit https://cla.microsoft.com.
231235

sdk/spring/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ parameters:
244244
displayName: 'spring-cloud-azure-starter-appconfiguration-config'
245245
type: boolean
246246
default: true
247+
# todo: add back when monitor support Spring Boot 4
247248
#- name: release_springcloudazurestartermonitor
248249
# displayName: 'spring-cloud-azure-starter-monitor'
249250
# type: boolean
@@ -603,6 +604,7 @@ extends:
603604
skipPublishDocMs: true
604605
skipVerifyChangeLog: true
605606
releaseInBatch: ${{ parameters.release_springcloudazurestarterappconfigurationconfig }}
607+
# todo: add back when monitor support Spring Boot 4
606608
# - name: spring-cloud-azure-starter-monitor
607609
# groupId: com.azure.spring
608610
# safeName: springcloudazurestartermonitor

sdk/spring/scripts/_constants.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ def get_spring_boot_version_tag_prefix(spring_boot_version):
2525

2626
# Since Spring Cloud Azure uses multiple versions of external dependencies managed by Spring Boot,
2727
# the modules that still use Spring Boot 2 to manage dependencies will be skipped.
28-
# SKIP_ADDING_DEPENDENCY_MANAGEMENT_ARTIFACTS = [
28+
SKIP_ADDING_DEPENDENCY_MANAGEMENT_ARTIFACTS = [
2929
# 'spring-cloud-azure-starter-monitor-test',
3030
# 'spring-cloud-azure-starter-monitor'
31-
# ]
31+
]
3232
# Since some features are based on a higher Spring Boot version, it is sufficient to let the modules
3333
# corresponding to these special Spring Boot versions use the latest Spring Boot version.
3434
SKIP_ADDING_DEPENDENCY_MANAGEMENT_ARTIFACTS_WITH_SPRING_BOOT_VERSION = {

0 commit comments

Comments
 (0)