From 240bd31ed2ad4e517b5cba3e9d67e4c9409d2958 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Wed, 14 Sep 2022 15:25:22 +0800
Subject: [PATCH] begin 1.8.0-2021.0.3-SNAPSHOT.

---
 .github/PULL_REQUEST_TEMPLATE.md          | 19 ++++++-----
 .github/workflows/codecov.yml             |  4 +--
 .github/workflows/junit_test.yml          | 36 ++++++++++----------
 CHANGELOG.md                              | 37 ---------------------
 changes/changes-1.7.0.md                  | 40 +++++++++++++++++++++++
 pom.xml                                   |  2 +-
 spring-cloud-tencent-dependencies/pom.xml |  4 +--
 7 files changed, 74 insertions(+), 68 deletions(-)
 create mode 100644 changes/changes-1.7.0.md

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2122207fd..b89266620 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,5 @@
 ## PR Type
+
 <!--
 Bugfix.
 Feature.
@@ -10,16 +11,18 @@ Other... Please describe:
 
 ## Describe what this PR does for and how you did.
 
+## Adding the issue link (#xxx) if possible.
 
-## Does this PR be associated with issue? If so, please adding the issue link below.
+## Note
 
+## Checklist
 
-## Note
+- [ ] Add copyright holder at the beginning of .class file if it is new.
+- [ ] Add information of this PR to CHANGELOG.md in root of project.
+- [ ] All junit tests passing.
+- [ ] Coverage from `Codecov Report` should not decrease.
 
+## Checklist (Optional)
 
-### Checklist
-- [ ] Code compiles correctly
-- [ ] Create at least one junit test if possible
-- [ ] All tests passing
-- [ ] Extend documentation if necessary
-- [ ] Add myself / the copyright holder to the AUTHORS file
\ No newline at end of file
+- [ ] Will Pull Request to branch of 2020.0 and hoxton.
+- [ ] Add documentation in javadoc in code or comment below the PR if necessary.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index 4ff20c5da..721286f3d 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -3,13 +3,13 @@ name: Codecov
 on:
   push:
     branches:
-      - main
+      - hoxton
       - 2021.0
       - 2020.0
       - greenwich
   pull_request:
     branches:
-      - main
+      - hoxton
       - 2021.0
       - 2020.0
       - greenwich
diff --git a/.github/workflows/junit_test.yml b/.github/workflows/junit_test.yml
index 165255247..d0200a5ff 100644
--- a/.github/workflows/junit_test.yml
+++ b/.github/workflows/junit_test.yml
@@ -6,13 +6,13 @@ name: Test with Junit
 on:
   push:
     branches:
-      - main
+      - hoxton
       - 2021.0
       - 2020.0
       - greenwich
   pull_request:
     branches:
-      - main
+      - hoxton
       - 2021.0
       - 2020.0
       - greenwich
@@ -27,19 +27,19 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - name: Checkout codes
-      uses: actions/checkout@v3
-    - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'temurin'
-        java-version: ${{ matrix.java }}
-    - name: Cache local Maven repository
-      uses: actions/cache@v3
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
-    - name: Test with Maven
-      run: mvn -B test --file pom.xml
+      - name: Checkout codes
+        uses: actions/checkout@v3
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java }}
+      - name: Cache local Maven repository
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Test with Maven
+        run: mvn -B test --file pom.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4089d1fd7..06c1f8175 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,40 +1,3 @@
 # Change Log
 ---
 
-- [Bugfix: optimize ratelimit actuator](https://github.com/Tencent/spring-cloud-tencent/pull/420)
-- [Optimize: add EncodeTransferMedataRestTemplateInterceptor to RestTemplate](https://github.com/Tencent/spring-cloud-tencent/pull/440)
-- [Feature: add rate limit filter debug log](https://github.com/Tencent/spring-cloud-tencent/pull/437)
-- [Add configurable heartbeat interval support](https://github.com/Tencent/spring-cloud-tencent/pull/444)
-- [feat:enhance Feign and RestTemplate and support Polaris monitor.](https://github.com/Tencent/spring-cloud-tencent/pull/447)
-- [Feature: support spring cloud config data.](https://github.com/Tencent/spring-cloud-tencent/pull/451)
-- [Optimize feign & rest-template circuit-breaker logic](https://github.com/Tencent/spring-cloud-tencent/pull/454)
-- [Feature: Add disposable metadata transfer support](https://github.com/Tencent/spring-cloud-tencent/pull/459)
-- [docs:update mvnw.](https://github.com/Tencent/spring-cloud-tencent/pull/476)
-- [docs:update configuration metadata.](https://github.com/Tencent/spring-cloud-tencent/pull/474)
-- [Feature: delete implement ServiceInstance](https://github.com/Tencent/spring-cloud-tencent/pull/483)
-- [test: add loadbalancer unit test](https://github.com/Tencent/spring-cloud-tencent/pull/485)
-- [Bugfix: update byte-buddy scope test to compile](https://github.com/Tencent/spring-cloud-tencent/pull/498)
-- [Fix the code analysis error.](https://github.com/Tencent/spring-cloud-tencent/pull/500)
-- [Fix typo & Code optimization](https://github.com/Tencent/spring-cloud-tencent/pull/512)
-- [BeanFactoryUtils returns all beans including beans defined in ancestor bean factories](https://github.com/Tencent/spring-cloud-tencent/pull/517)
-- [fix:add spring-cloud-starter-bootstrap dependency for example](https://github.com/Tencent/spring-cloud-tencent/pull/521)
-- [Feature: Add router actuate endpoint](https://github.com/Tencent/spring-cloud-tencent/pull/523)
-- [Optimize router label resolver spi](https://github.com/Tencent/spring-cloud-tencent/pull/524)
-- [Code optimization for rpc-enhancement module](https://github.com/Tencent/spring-cloud-tencent/pull/526)
-- [Feature: Optimized configuration update](https://github.com/Tencent/spring-cloud-tencent/pull/528)
-- [Feature：support pushGateway push metrics](https://github.com/Tencent/spring-cloud-tencent/pull/529)
-- [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/536)
-- [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/542)
-- [add feature-env plugin & add spring cloud gateway staining plugin](https://github.com/Tencent/spring-cloud-tencent/pull/533)
-- [feature:add @ConditionalOnConfigReflectEnabled annotation](https://github.com/Tencent/spring-cloud-tencent/pull/539)
-- [fix:set error handler named EnhancedRestTemplateReporter for RestTemplate](https://github.com/Tencent/spring-cloud-tencent/pull/545)
-- [Optimize: add switch for report call result and default false](https://github.com/Tencent/spring-cloud-tencent/pull/550)
-- [Optimize: shutdown server when connect to config server failed](https://github.com/Tencent/spring-cloud-tencent/pull/554)
-- [Report the labels in request when report the result of invocation by Feign](https://github.com/Tencent/spring-cloud-tencent/pull/556)
-- [fix:fix heartbeat interval different configuration from polaris-java SDK.](https://github.com/Tencent/spring-cloud-tencent/pull/559)
-- [Optimize: optimize report call result for restTemplate.](https://github.com/Tencent/spring-cloud-tencent/pull/565)
-- [feat:add spring-cloud-starter-tencent-all and quickstart examples.](https://github.com/Tencent/spring-cloud-tencent/pull/569)
-- [refactor:optimize project and code.](https://github.com/Tencent/spring-cloud-tencent/pull/571)
-- [Optimize:change default dynamic config refresh type to reflect.](https://github.com/Tencent/spring-cloud-tencent/pull/575)
-- [feat:optimize examples.](https://github.com/Tencent/spring-cloud-tencent/pull/578)
-- [fix:fix NullPointerException error when using RestTemplate with no label.](https://github.com/Tencent/spring-cloud-tencent/pull/586)
diff --git a/changes/changes-1.7.0.md b/changes/changes-1.7.0.md
new file mode 100644
index 000000000..4089d1fd7
--- /dev/null
+++ b/changes/changes-1.7.0.md
@@ -0,0 +1,40 @@
+# Change Log
+---
+
+- [Bugfix: optimize ratelimit actuator](https://github.com/Tencent/spring-cloud-tencent/pull/420)
+- [Optimize: add EncodeTransferMedataRestTemplateInterceptor to RestTemplate](https://github.com/Tencent/spring-cloud-tencent/pull/440)
+- [Feature: add rate limit filter debug log](https://github.com/Tencent/spring-cloud-tencent/pull/437)
+- [Add configurable heartbeat interval support](https://github.com/Tencent/spring-cloud-tencent/pull/444)
+- [feat:enhance Feign and RestTemplate and support Polaris monitor.](https://github.com/Tencent/spring-cloud-tencent/pull/447)
+- [Feature: support spring cloud config data.](https://github.com/Tencent/spring-cloud-tencent/pull/451)
+- [Optimize feign & rest-template circuit-breaker logic](https://github.com/Tencent/spring-cloud-tencent/pull/454)
+- [Feature: Add disposable metadata transfer support](https://github.com/Tencent/spring-cloud-tencent/pull/459)
+- [docs:update mvnw.](https://github.com/Tencent/spring-cloud-tencent/pull/476)
+- [docs:update configuration metadata.](https://github.com/Tencent/spring-cloud-tencent/pull/474)
+- [Feature: delete implement ServiceInstance](https://github.com/Tencent/spring-cloud-tencent/pull/483)
+- [test: add loadbalancer unit test](https://github.com/Tencent/spring-cloud-tencent/pull/485)
+- [Bugfix: update byte-buddy scope test to compile](https://github.com/Tencent/spring-cloud-tencent/pull/498)
+- [Fix the code analysis error.](https://github.com/Tencent/spring-cloud-tencent/pull/500)
+- [Fix typo & Code optimization](https://github.com/Tencent/spring-cloud-tencent/pull/512)
+- [BeanFactoryUtils returns all beans including beans defined in ancestor bean factories](https://github.com/Tencent/spring-cloud-tencent/pull/517)
+- [fix:add spring-cloud-starter-bootstrap dependency for example](https://github.com/Tencent/spring-cloud-tencent/pull/521)
+- [Feature: Add router actuate endpoint](https://github.com/Tencent/spring-cloud-tencent/pull/523)
+- [Optimize router label resolver spi](https://github.com/Tencent/spring-cloud-tencent/pull/524)
+- [Code optimization for rpc-enhancement module](https://github.com/Tencent/spring-cloud-tencent/pull/526)
+- [Feature: Optimized configuration update](https://github.com/Tencent/spring-cloud-tencent/pull/528)
+- [Feature：support pushGateway push metrics](https://github.com/Tencent/spring-cloud-tencent/pull/529)
+- [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/536)
+- [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/542)
+- [add feature-env plugin & add spring cloud gateway staining plugin](https://github.com/Tencent/spring-cloud-tencent/pull/533)
+- [feature:add @ConditionalOnConfigReflectEnabled annotation](https://github.com/Tencent/spring-cloud-tencent/pull/539)
+- [fix:set error handler named EnhancedRestTemplateReporter for RestTemplate](https://github.com/Tencent/spring-cloud-tencent/pull/545)
+- [Optimize: add switch for report call result and default false](https://github.com/Tencent/spring-cloud-tencent/pull/550)
+- [Optimize: shutdown server when connect to config server failed](https://github.com/Tencent/spring-cloud-tencent/pull/554)
+- [Report the labels in request when report the result of invocation by Feign](https://github.com/Tencent/spring-cloud-tencent/pull/556)
+- [fix:fix heartbeat interval different configuration from polaris-java SDK.](https://github.com/Tencent/spring-cloud-tencent/pull/559)
+- [Optimize: optimize report call result for restTemplate.](https://github.com/Tencent/spring-cloud-tencent/pull/565)
+- [feat:add spring-cloud-starter-tencent-all and quickstart examples.](https://github.com/Tencent/spring-cloud-tencent/pull/569)
+- [refactor:optimize project and code.](https://github.com/Tencent/spring-cloud-tencent/pull/571)
+- [Optimize:change default dynamic config refresh type to reflect.](https://github.com/Tencent/spring-cloud-tencent/pull/575)
+- [feat:optimize examples.](https://github.com/Tencent/spring-cloud-tencent/pull/578)
+- [fix:fix NullPointerException error when using RestTemplate with no label.](https://github.com/Tencent/spring-cloud-tencent/pull/586)
diff --git a/pom.xml b/pom.xml
index ee40d748e..7fb208b97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.7.0-2021.0.3</revision>
+		<revision>1.8.0-2021.0.3-SNAPSHOT</revision>
 
 		<!-- Spring Cloud -->
 		<spring.cloud.version>2021.0.3</spring.cloud.version>
diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index 3b97216d9..9b7d1c7e9 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -70,10 +70,10 @@
 	</developers>
 
 	<properties>
-		<revision>1.7.0-2021.0.3</revision>
+		<revision>1.8.0-2021.0.3-SNAPSHOT</revision>
 
 		<!-- Dependencies -->
-		<polaris.version>1.7.4</polaris.version>
+		<polaris.version>1.8.0-SNAPSHOT</polaris.version>
 		<guava.version>31.0.1-jre</guava.version>
 		<logback.version>1.2.11</logback.version>
 		<mocktio.version>4.5.1</mocktio.version>