diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a56dd0d4b..236851ebe 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -26,6 +26,7 @@ fixes # ## Checklist (Optional) -- [ ] Will pull request to branch of 2020.0. +- [ ] 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 hoxton. diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 011787bdb..343fa995e 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -3,6 +3,7 @@ name: Codecov on: push: branches: + - 2023.0 - 2022.0 - 2021.0 - 2020.0 @@ -10,6 +11,7 @@ on: - greenwich pull_request: branches: + - 2023.0 - 2022.0 - 2021.0 - 2020.0 diff --git a/.github/workflows/junit_test17.yml b/.github/workflows/junit_test17.yml index df22e8e46..432f19a0e 100644 --- a/.github/workflows/junit_test17.yml +++ b/.github/workflows/junit_test17.yml @@ -1,14 +1,16 @@ # This workflow will build a Java project with Maven # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven -name: Test with Junit 2022.0 +name: Test with Junit (JDK17) on: push: branches: + - 2023.0 - 2022.0 pull_request: branches: + - 2023.0 - 2022.0 jobs: diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index e5e639135..9d01eb4a8 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -3,6 +3,7 @@ name: License checker on: push: branches: + - 2023.0 - 2022.0 - 2021.0 - 2020.0 @@ -10,6 +11,7 @@ on: - greenwich pull_request: branches: + - 2023.0 - 2022.0 - 2021.0 - 2020.0 diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 1809ba7c6..622c086a9 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -3,6 +3,7 @@ name: Snapshot on: push: branches: + - 2023.0 - 2022.0 - 2021.0 - 2020.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 04c633a31..d188cf6a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ # Change Log --- -- [fix: Fix restTemplateCustomizer bean conflict causing service to fail to start properly at #1229.](https://github.com/Tencent/spring-cloud-tencent/pull/1236) + +- [fix: Fix restTemplateCustomizer bean conflict causing service to fail to start properly at #1229.](https://github.com/Tencent/spring-cloud-tencent/pull/1235) +- [feat:support 2022.0.5.](https://github.com/Tencent/spring-cloud-tencent/pull/1236) diff --git a/pom.xml b/pom.xml index 77c67121d..14367d6bf 100644 --- a/pom.xml +++ b/pom.xml @@ -89,16 +89,16 @@ - 1.14.0-2022.0.4-SNAPSHOT + 1.14.0-2022.0.5-SNAPSHOT - 6.0.16 + 6.0.17 - 3.1.7 + 3.1.8 - 2022.0.4 + 2022.0.5 0.8.8 diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index e6d1092c8..0b27394fb 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -70,7 +70,7 @@ - 1.14.0-2022.0.4-SNAPSHOT + 1.14.0-2022.0.5-SNAPSHOT 1.15.0