diff --git a/README-zh.md b/README-zh.md index a52b26ffb..373608c4b 100644 --- a/README-zh.md +++ b/README-zh.md @@ -48,15 +48,16 @@ Spring Cloud Alibaba 致力于提供微服务开发的一站式解决方案。 更多组件请参考 [Roadmap](https://github.com/alibaba/spring-cloud-alibaba/blob/master/Roadmap-zh.md)。 ## 如何构建 - -* master 分支对应的是 Spring Cloud Greenwich,最低支持 JDK 1.8。 +* 2020.0 分支对应的是 Spring Cloud 2020,最低支持 JDK 1.8。 +* master 分支对应的是 Spring Cloud Hoxton,最低支持 JDK 1.8。 +* greenwich 分支对应的是 Spring Cloud Greenwich,最低支持 JDK 1.8。 * finchley 分支对应的是 Spring Cloud Finchley,最低支持 JDK 1.8。 * 1.x 分支对应的是 Spring Cloud Edgware,最低支持 JDK 1.7。 Spring Cloud 使用 Maven 来构建,最快的使用方式是将本项目 clone 到本地,然后执行以下命令: - +```bash ./mvnw install - +``` 执行完毕后,项目将被安装到本地 Maven 仓库。 ## 如何使用 @@ -64,7 +65,7 @@ Spring Cloud 使用 Maven 来构建,最快的使用方式是将本项目 clone ### 如何引入依赖 如果需要使用已发布的版本,在 `dependencyManagement` 中添加如下配置。 - +```xml @@ -76,7 +77,7 @@ Spring Cloud 使用 Maven 来构建,最快的使用方式是将本项目 clone - +``` 然后在 `dependencies` 中添加自己所需使用的依赖即可使用。 ## 演示 Demo @@ -111,7 +112,7 @@ Example 列表: * 2.0.x 版本适用于 Spring Boot 2.0.x * 2.1.x 版本适用于 Spring Boot 2.1.x * 2.2.x 版本适用于 Spring Boot 2.2.x - +* 2021.x 版本适用于 Spring Boot 2.4.x ## 社区交流 diff --git a/README.md b/README.md index df9a1d1aa..559683cfe 100644 --- a/README.md +++ b/README.md @@ -51,22 +51,23 @@ For more features, please refer to [Roadmap](https://github.com/alibaba/spring-c For more features please refer to [Roadmap](https://github.com/alibaba/spring-cloud-alibaba/blob/master/Roadmap.md). ## How to build - -* **master branch**: Corresponds to Spring Cloud Greenwich & Spring Boot 2.x. JDK 1.8 or later versions are supported. -* **finchley branch**: Corresponds to Spring Cloud Finchley & Spring Boot 2.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. +* **master 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. +* **finchley branch**: Corresponds to Spring Cloud Finchley & Spring Boot 2.0.x. JDK 1.8 or later versions are supported. * **1.x branch**: Corresponds to Spring Cloud Edgware & Spring Boot 1.x, JDK 1.7 or later versions are supported. Spring Cloud uses Maven for most build-related activities, and you should be able to get off the ground quite quickly by cloning the project you are interested in and typing: - +```bash ./mvnw install - +``` ## How to Use ### Add maven dependency These artifacts are available from Maven Central and Spring Release repository via BOM: - +```xml @@ -78,7 +79,7 @@ These artifacts are available from Maven Central and Spring Release repository v - +``` add the module in `dependencies`. @@ -118,6 +119,7 @@ As the interfaces and annotations of Spring Boot 1 and Spring Boot 2 have been c * 2.0.x for Spring Boot 2.0.x * 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 ## 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.