diff --git a/README-zh.md b/README-zh.md index 1795602c9..b4ece52c5 100644 --- a/README-zh.md +++ b/README-zh.md @@ -27,7 +27,7 @@ Spring Cloud Alibaba 致力于提供微服务开发的一站式解决方案。 * **阿里云短信服务**:覆盖全球的短信服务,友好、高效、智能的互联化通讯能力,帮助企业迅速搭建客户触达通道。 -更多功能请参考 [Roadmap](https://github.com/alibaba/spring-cloud-alibaba/blob/2022.x/Roadmap-zh.md) +更多功能请参考 [Roadmap](https://github.com/alibaba/spring-cloud-alibaba/blob/2021.x/Roadmap-zh.md) 除了上述所具有的功能外,针对企业级用户的场景,Spring Cloud Alibaba 配套的企业版微服务治理方案 [微服务引擎MSE](https://www.aliyun.com/product/aliware/mse?spm=github.spring.com.topbar) 还提供了企业级微服务治理中心,包括全链路灰度、服务预热、无损上下线和离群实例摘除等更多更强大的治理能力,同时还提供了企业级 Nacos 注册配置中心,企业级云原生网关等多种产品及解决方案。 @@ -52,7 +52,7 @@ Spring Cloud Alibaba 致力于提供微服务开发的一站式解决方案。 更多组件请参考 [Roadmap](https://github.com/alibaba/spring-cloud-alibaba/blob/2022.0/Roadmap-zh.md)。 ## 如何构建 -* 2022.x 分支对应的是 Spring Cloud 2022 与 Spring Boot 2.6.x,最低支持 JDK 1.8。 +* 2021.x 分支对应的是 Spring Cloud 2022 与 Spring Boot 2.6.x,最低支持 JDK 1.8。 * 2020.0 分支对应的是 Spring Cloud 2020 与 Spring Boot 2.4.x,最低支持 JDK 1.8。 * 2.2.x 分支对应的是 Spring Cloud Hoxton 与 Spring Boot 2.2.x,最低支持 JDK 1.8。 * greenwich 分支对应的是 Spring Cloud Greenwich 与 Spring Boot 2.1.x,最低支持 JDK 1.8。 @@ -118,7 +118,7 @@ Example 列表: * 2.1.x 版本适用于 Spring Boot 2.1.x * 2.2.x 版本适用于 Spring Boot 2.2.x * 2020.x 版本适用于 Spring Boot 2.4.x -* 2022.x 版本适用于 Spring Boot 2.6.x +* 2021.x 版本适用于 Spring Boot 2.6.x ## 社区交流 diff --git a/README.md b/README.md index 0bd635cef..b007efbc1 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ In addition to the above-mentioned features, for the needs of enterprise users' For more features please refer to [Roadmap](https://github.com/alibaba/spring-cloud-alibaba/blob/master/Roadmap.md). ## How to build -* **2022.x branch**: Corresponds to Spring Cloud 2021 & Spring Boot 2.6.x. JDK 1.8 or later versions are supported. +* **2021.x branch**: Corresponds to Spring Cloud 2021 & Spring Boot 2.6.x. JDK 1.8 or later versions are supported. * **2020.0 branch**: Corresponds to Spring Cloud 2020 & Spring Boot 2.4.x. JDK 1.8 or later versions are supported. * **2.2.x branch**: Corresponds to Spring Cloud Hoxton & Spring Boot 2.2.x. JDK 1.8 or later versions are supported. * **greenwich branch**: Corresponds to Spring Cloud Greenwich & Spring Boot 2.1.x. JDK 1.8 or later versions are supported. @@ -123,7 +123,7 @@ As the interfaces and annotations of Spring Boot 1 and Spring Boot 2 have been c * 2.1.x for Spring Boot 2.1.x * 2.2.x for Spring Boot 2.2.x * 2020.x for Spring Boot 2.4.x -* 2022.x for Spring Boot 2.6.x +* 2021.x for Spring Boot 2.6.x ## Code of Conduct This project is a sub-project of Spring Cloud, it adheres to the Contributor Covenant [code of conduct](https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc). By participating, you are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io. diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sca-upgrade-guide.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sca-upgrade-guide.adoc index 0804a8a38..a2526b45e 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sca-upgrade-guide.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sca-upgrade-guide.adoc @@ -98,7 +98,7 @@ Add a spring.config.import=nacos: property to your configuration. - 假如想保留以前的使用方式 (bootstrap引入配置),你只需要添加依赖 `spring-cloud-starter-bootstrap` 依赖,不需要修改一行代码 -你可以前往 https://github.com/alibaba/spring-cloud-alibaba/tree/2022.x/spring-cloud-alibaba-examples/nacos-example/nacos-config-2.4.x-example[这里] 查看具体example +你可以前往 https://github.com/alibaba/spring-cloud-alibaba/tree/2021.x/spring-cloud-alibaba-examples/nacos-example/nacos-config-2.4.x-example[这里] 查看具体example ==== Nacos 容错能力 @@ -178,7 +178,7 @@ feign: *注意事项:* 如果你使用的是 `spring-cloud-starter-alibaba-sentinel`,请**不要**配置 `feign.sentinel.enable=true`,会使配置失效 -你可以前往 https://github.com/alibaba/spring-cloud-alibaba/tree/2022.x/spring-cloud-alibaba-examples/sentinel-example/sentinel-circuitbreaker-example[这里] 查看具体 example +你可以前往 https://github.com/alibaba/spring-cloud-alibaba/tree/2021.x/spring-cloud-alibaba-examples/sentinel-example/sentinel-circuitbreaker-example[这里] 查看具体 example === 对升级的一点建议 1. 在 spring boot 2.6 之后默认开启了禁止循环引入,建议大家不要关闭,这是一种不好的编码习惯,如果你的项目里出现了循环引用,请选择重构它 diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/sca-upgrade-guide.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/sca-upgrade-guide.adoc index 273026e15..f82fcaf62 100644 --- a/spring-cloud-alibaba-docs/src/main/asciidoc/sca-upgrade-guide.adoc +++ b/spring-cloud-alibaba-docs/src/main/asciidoc/sca-upgrade-guide.adoc @@ -98,7 +98,7 @@ You can manually turn it off by setting `spring.cloud.nacos.config.import-check. - If you want to keep the previous usage (bootstrap way), you only need to add the dependency `spring-cloud-starter-bootstrap` dependency and don't need modifying a line of code. -you can go https://github.com/alibaba/spring-cloud-alibaba/tree/2022.x/spring-cloud-alibaba-examples/nacos-example/nacos-config-2.4.x-example[here] to see the complete example. +you can go https://github.com/alibaba/spring-cloud-alibaba/tree/2021.x/spring-cloud-alibaba-examples/nacos-example/nacos-config-2.4.x-example[here] to see the complete example. ==== Nacos Failure Tolerance @@ -177,7 +177,7 @@ This feature also supports dynamic refresh from the configuration center. You ca *Note:* If you are using `spring-cloud-starter-alibaba-sentinel`, please *DO NOT* configure `feign.sentinel.enable=true`, it will invalidate the configuration. -You can go https://github.com/alibaba/spring-cloud-alibaba/tree/2022.x/spring-cloud-alibaba-examples/sentinel-example/sentinel-circuitbreaker-example[here] to see the complete example. +You can go https://github.com/alibaba/spring-cloud-alibaba/tree/2021.x/spring-cloud-alibaba-examples/sentinel-example/sentinel-circuitbreaker-example[here] to see the complete example. === Little Advice For Upgrading 1. After Spring Boot 2.6, the prohibition of circular reference is enabled by default. It is recommended that you do not change it. This is a bad coding practice. If there is a circular reference in your project, please choose to refactor it.