Merge branch '2022.0' into 2022.0

.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.

.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

.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:

.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

.github/workflows/snapshot.yml

@@ -3,6 +3,7 @@ name: Snapshot
 on:
   push:
     branches:
+      - 2023.0
       - 2022.0
       - 2021.0
       - 2020.0

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)

pom.xml

@@ -89,16 +89,16 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.14.0-2022.0.4-SNAPSHOT</revision>
+		<revision>1.14.0-2022.0.5-SNAPSHOT</revision>
 
 		<!-- Spring Framework -->
-		<spring.framework.version>6.0.16</spring.framework.version>
+		<spring.framework.version>6.0.17</spring.framework.version>
 
 		<!-- Spring Boot -->
-		<spring.boot.version>3.1.7</spring.boot.version>
+		<spring.boot.version>3.1.8</spring.boot.version>
 
 		<!-- Spring Cloud -->
-		<spring.cloud.version>2022.0.4</spring.cloud.version>
+		<spring.cloud.version>2022.0.5</spring.cloud.version>
 
 		<!-- Maven Plugin Versions -->
 		<jacoco.version>0.8.8</jacoco.version>

spring-cloud-tencent-dependencies/pom.xml

@@ -70,7 +70,7 @@
 	</developers>
 
 	<properties>
-		<revision>1.14.0-2022.0.4-SNAPSHOT</revision>
+		<revision>1.14.0-2022.0.5-SNAPSHOT</revision>
 
 		<!-- Dependencies -->
 		<polaris.version>1.15.0</polaris.version>