diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f04cb49c3..ddd1ce6e1 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -26,7 +26,8 @@ closes # ## Checklist (Optional) -- [ ] Will pull request to branch of 2023.0. -- [ ] Will pull request to branch of 2022.0. -- [ ] Will pull request to branch of 2020.0. +- [ ] Will pull request to branch of 2023. +- [ ] Will pull request to branch of 2022. +- [ ] Will pull request to branch of 2021. +- [ ] Will pull request to branch of 2020. - [ ] Will pull request to branch of hoxton. diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 343fa995e..c0e7a1bfe 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -3,18 +3,18 @@ name: Codecov on: push: branches: - - 2023.0 - - 2022.0 - - 2021.0 - - 2020.0 + - 2023 + - 2022 + - 2021 + - 2020 - hoxton - greenwich pull_request: branches: - - 2023.0 - - 2022.0 - - 2021.0 - - 2020.0 + - 2023 + - 2022 + - 2021 + - 2020 - hoxton - greenwich diff --git a/.github/workflows/junit_test.yml b/.github/workflows/junit_test.yml index c26f1d8be..89536f137 100644 --- a/.github/workflows/junit_test.yml +++ b/.github/workflows/junit_test.yml @@ -7,14 +7,14 @@ on: push: branches: - hoxton - - 2021.0 - - 2020.0 + - 2021 + - 2020 - greenwich pull_request: branches: - hoxton - - 2021.0 - - 2020.0 + - 2021 + - 2020 - greenwich jobs: diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index 9d01eb4a8..f5ce8c68f 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -3,18 +3,18 @@ name: License checker on: push: branches: - - 2023.0 - - 2022.0 - - 2021.0 - - 2020.0 + - 2023 + - 2022 + - 2021 + - 2020 - hoxton - greenwich pull_request: branches: - - 2023.0 - - 2022.0 - - 2021.0 - - 2020.0 + - 2023 + - 2022 + - 2021 + - 2020 - hoxton - greenwich jobs: diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 622c086a9..4390363f1 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -3,10 +3,10 @@ name: Snapshot on: push: branches: - - 2023.0 - - 2022.0 - - 2021.0 - - 2020.0 + - 2023 + - 2022 + - 2021 + - 2020 - hoxton - greenwich diff --git a/README-zh.md b/README-zh.md index 4aa11575f..1c457db43 100644 --- a/README-zh.md +++ b/README-zh.md @@ -5,8 +5,8 @@ [![Contributors](https://img.shields.io/github/contributors/Tencent/spring-cloud-tencent)](https://github.com/Tencent/spring-cloud-tencent/graphs/contributors) [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) -[![Test with Junit](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml/badge.svg?branch=2021.0)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml) -[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2021.0/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2021.0) +[![Test with Junit](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml/badge.svg?branch=2021)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml) +[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2021/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2021) [English](./README.md) | 简体中文 @@ -61,7 +61,7 @@ Spring Cloud Tencent 所有组件都已上传到 Maven 中央仓库，只需要 > 注意： > -> 支持Spring Cloud 版本：2023.0, 2022.0、2021.0、2020.0、Hoxton。 +> 支持Spring Cloud 版本：2023, 2022、2021、2020、Hoxton。 > > Spring Cloud Tencent > 的版本列表可以查看 diff --git a/README.md b/README.md index 2a9bd2192..0d54ac05b 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ [![Contributors](https://img.shields.io/github/contributors/Tencent/spring-cloud-tencent)](https://github.com/Tencent/spring-cloud-tencent/graphs/contributors) [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) -[![Test with Junit](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml/badge.svg?branch=2021.0)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml) -[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2021.0/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2021.0) +[![Test with Junit](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml/badge.svg?branch=2021)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml) +[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/2021/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=2021) English | [简体中文](./README-zh.md) @@ -63,7 +63,7 @@ dependencies. > Notice: > -> Support Spring Cloud 2023.0, 2022.0, 2021.0, 2020.0, Hoxton. +> Support Spring Cloud 2023, 2022, 2021, 2020, Hoxton. > > The version list of Spring Cloud Tencent can be found > in diff --git a/pom.xml b/pom.xml index 379ec8601..9039f99fd 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ ${revision} Spring Cloud Tencent Spring Cloud Tencent - https://github.com/Tencent/spring-cloud-tencent/tree/2021.0 + https://github.com/Tencent/spring-cloud-tencent/tree/2021 Tencent @@ -26,7 +26,7 @@ The BSD 3-Clause License (BSD3) - https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2021.0/LICENSE + https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2021/LICENSE repo diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 009f3cafd..e3842eeaa 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -16,7 +16,7 @@ pom Spring Cloud Tencent Dependencies Spring Cloud Tencent Dependencies - https://github.com/Tencent/spring-cloud-tencent/tree/2021.0 + https://github.com/Tencent/spring-cloud-tencent/tree/2021 Tencent @@ -26,7 +26,7 @@ The BSD 3-Clause License (BSD3) - https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2021.0/LICENSE + https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2021/LICENSE repo