diff --git a/Code-of-Conduct.md b/Code-of-Conduct.md index 9212b41b..2a9e8e35 100644 --- a/Code-of-Conduct.md +++ b/Code-of-Conduct.md @@ -3,4 +3,4 @@ Spring Cloud Tencent follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Spring Cloud Tencent Code of Conduct Committee via email: SpringCloudTencent_Community@qq.com \ No newline at end of file +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Spring Cloud Tencent Code of Conduct Committee via email: SpringCloudTencent@tencent.com \ No newline at end of file diff --git a/README-zh.md b/README-zh.md index bd80849f..468ceba3 100644 --- a/README-zh.md +++ b/README-zh.md @@ -62,12 +62,12 @@ Example 列表: 采取与Spring Cloud大版本号相关的版本策略。 -项目的版本号格式为 ```大版本号.小版本号.补丁版本号.对应Spring Cloud版本号.发布类型``` 的形式。 -大版本号、小版本号、补丁版本号的类型为数字,从 0 开始取值。项目处于孵化器阶段时,大版本号固定使用 0 。 -对应Spring Cloud版本号为Spring Cloud提供的英文版本号,例如Hoxton、Greenwich等。 -发布类型包括正式发布(RELEASE)、最终测试版(RC)、测试版(BETA)。 +项目的版本号格式为 ```大版本号.小版本号.补丁版本号.对应Spring Cloud的大版本号.对应Spring Cloud的小版本号-发布类型``` 的形式。 +大版本号、小版本号、补丁版本号的类型为数字,从 0 开始取值。 +对应Spring Cloud的大版本号为Spring Cloud提供的英文版本号,例如Hoxton、Greenwich等。对应Spring Cloud的小版本号为Spring Cloud给出的小版本号,例如 RS9 等。 +发布类型目前包括正式发布和发布候选版(RC)。在实际的版本号中,正式发布版不额外添加发布类型,发布候选版将添加后缀,并从 RC0 开始。 -示例:0.1.0.Hoxton.BETA +示例:1.0.0.Hoxton.SR9-RC0 ## License The spring-cloud-tencent is licensed under the BSD 3-Clause License. Copyright and license information can be found in the file [LICENSE](LICENSE) diff --git a/README.md b/README.md index 848bb04f..c8d123e2 100644 --- a/README.md +++ b/README.md @@ -64,12 +64,12 @@ Example List: We use a version policy related to Spring Cloud's major version number. -Project version includes ```${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.${CORRESPONDING_VERSION_OF_SPRING_CLOUD}.${RELEASE_TYPE}```. -```${MAJOR_VERSION}```, ```${MINOR_VERSION}```, ```${PATCH_VERSION}``` are in numbers starting from 0. This project is in the incubating phase, so the major version is set to 0. -```${CORRESPONDING_VERSION_OF_SPRING_CLOUD}``` is the same as the version number of Spring Cloud, like Hoxton, Greenwich. -```${RELEASE_TYPE}``` will be like RELEASE, RC and BETA. +Project version includes ```${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.${CORRESPONDING_MAJOR_VERSION_OF_SPRING_CLOUD}.${CORRESPONDING_MINOR_VERSION_OF_SPRING_CLOUD}-${RELEASE_TYPE}```. +```${MAJOR_VERSION}```, ```${MINOR_VERSION}```, ```${PATCH_VERSION}``` are in numbers starting from 0. +```${CORRESPONDING_MAJOR_VERSION_OF_SPRING_CLOUD}``` is the same as the major version number of Spring Cloud, like Hoxton, Greenwich. ```${CORRESPONDING_MINOR_VERSION_OF_SPRING_CLOUD}``` is the same as the major version number of Spring Cloud, like RS9. +```${RELEASE_TYPE}``` is like RELEASE or RC currently. Actually, the RELEASE version does not add a release type in the version, and the RS version will add a suffix and start from RC0. -For example: 0.1.0.Hoxton.BETA +For example: 1.0.0.Hoxton.SR9-RC0 ## License The spring-cloud-tencent is licensed under the BSD 3-Clause License. Copyright and license information can be found in the file [LICENSE](LICENSE) diff --git a/pom.xml b/pom.xml index c22b6d0e..f60bd701 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ - 0.1.0.Hoxton.BETA + 1.0.0.Hoxton.SR9 Hoxton.SR9 diff --git a/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml b/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml index 8169ff48..5975fed2 100644 --- a/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml @@ -16,7 +16,7 @@ 3.2.2 2.5 - 2.6 + 2.7 @@ -56,12 +56,6 @@ commons-io ${commons.io.version} - - - com.google.guava - guava - 28.0-jre - \ No newline at end of file