From a8e230a39b3f01a45afbd7169dfeb2f1601f67b8 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Wed, 14 Sep 2022 16:48:38 +0800
Subject: [PATCH] begin 1.8.0-Hoxton.SR12-SNAPSHOT. (#592)

---
 .github/PULL_REQUEST_TEMPLATE.md          |  4 +--
 .github/workflows/codecov.yml             |  7 ++---
 .github/workflows/junit_test.yml          | 36 +++++++++++------------
 CHANGELOG.md                              | 29 ------------------
 README-zh.md                              |  4 +--
 README.md                                 |  4 +--
 changes/changes-1.7.1.md                  | 32 ++++++++++++++++++++
 pom.xml                                   |  6 ++--
 spring-cloud-tencent-dependencies/pom.xml |  8 ++---
 9 files changed, 65 insertions(+), 65 deletions(-)
 create mode 100644 changes/changes-1.7.1.md

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b162ac3a..b8926662 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,5 @@
 ## PR Type
+
 <!--
 Bugfix.
 Feature.
@@ -23,6 +24,5 @@ Other... Please describe:
 
 ## Checklist (Optional)
 
-- [ ] Will Pull Request to branch of 2020.0 and 2021.0.
+- [ ] Will Pull Request to branch of 2020.0 and hoxton.
 - [ ] Add documentation in javadoc in code or comment below the PR if necessary.
-- [ ] Add your name as @author to the beginning of .class file.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index cc452e86..721286f3 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -1,18 +1,15 @@
-# 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: 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 16525524..d0200a5f 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 5abef9df..06c1f817 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,32 +1,3 @@
 # Change Log
 ---
 
-- [Feature: support ribbon service-level rule customization](https://github.com/Tencent/spring-cloud-tencent/pull/478)
-- [Fix the code analysis error.](https://github.com/Tencent/spring-cloud-tencent/pull/479)
-- [Feature: delete implement ServiceInstance](https://github.com/Tencent/spring-cloud-tencent/pull/481)
-- [Upgrade owasp esapi's configuration](https://github.com/Tencent/spring-cloud-tencent/pull/492)
-- [Bugfix: update byte-buddy scope test to compile](https://github.com/Tencent/spring-cloud-tencent/pull/495)
-- [feature:add @ConditionalOnConfigReflectEnabled annotation](https://github.com/Tencent/spring-cloud-tencent/pull/496)
-- [Feature: zuul supports polaris router](https://github.com/Tencent/spring-cloud-tencent/pull/502)
-- [Feature：support pushGateway push metrics](https://github.com/Tencent/spring-cloud-tencent/pull/504)
-- [Refactor : optimize project and code](https://github.com/Tencent/spring-cloud-tencent/pull/506)
-- [Fix typo & Code optimization](https://github.com/Tencent/spring-cloud-tencent/pull/507)
-- [Code optimization for rpc-enhancement module](https://github.com/Tencent/spring-cloud-tencent/pull/510)
-- [Bugfix：BeanFactoryUtils returns all beans including beans defined in ancestor bean factories](https://github.com/Tencent/spring-cloud-tencent/pull/515)
-- [fix:fix only config file metadata can be used in routing bug.](https://github.com/Tencent/spring-cloud-tencent/pull/518)
-- [optimize：optimize config module code](https://github.com/Tencent/spring-cloud-tencent/pull/520)
-- [feat:optimize pushgateway plugin.](https://github.com/Tencent/spring-cloud-tencent/pull/530)
-- [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/535)
-- [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/541)
-- [fix:set error handler named EnhancedRestTemplateReporter for RestTemplate](https://github.com/Tencent/spring-cloud-tencent/pull/543)
-- [Fix issue: report the labels in request when report the result of invocation by Feign](https://github.com/Tencent/spring-cloud-tencent/pull/546)
-- [optimize：add switch for report call result and default false](https://github.com/Tencent/spring-cloud-tencent/pull/547)
-- [Optimize: refresh @Value by reflect and only refresh affected ConfigurationProperties beans](https://github.com/Tencent/spring-cloud-tencent/pull/548)
-- [feature:remove ConditionalOnConfigReflectEnabled annotation.](https://github.com/Tencent/spring-cloud-tencent/pull/551)
-- [Optimize:shutdown server when connect to config server failed.](https://github.com/Tencent/spring-cloud-tencent/pull/552)
-- [fix:fix heartbeat interval different configuration from polaris-java SDK.](https://github.com/Tencent/spring-cloud-tencent/pull/560)
-- [Optimize: optimize report call result for restTemplate.](https://github.com/Tencent/spring-cloud-tencent/pull/562)
-- [feat:add spring-cloud-starter-tencent-all and quickstart examples.](https://github.com/Tencent/spring-cloud-tencent/pull/567)
-- [fix:fix wrong internal config file load order.](https://github.com/Tencent/spring-cloud-tencent/pull/572)
-- [Optimize:change default dynamic config refresh type to reflect.](https://github.com/Tencent/spring-cloud-tencent/pull/573)
-- [feat:optimize examples.](https://github.com/Tencent/spring-cloud-tencent/pull/576)
diff --git a/README-zh.md b/README-zh.md
index 3d854a34..9b435ff4 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -1,4 +1,4 @@
-<img src="https://github.com/Tencent/spring-cloud-tencent/raw/main/doc/logo/rectangle-white.png" width="60%" height="60%"  alt="Spring-Cloud-Tencent-Logo"/>
+<img src="https://github.com/Tencent/spring-cloud-tencent/raw/hoxton/doc/logo/rectangle-white.png" width="60%" height="60%"  alt="Spring-Cloud-Tencent-Logo"/>
 
 [![Wiki](https://badgen.net/badge/icon/wiki?icon=wiki&label)](https://github.com/Tencent/spring-cloud-tencent/wiki)
 [![Maven Central](https://img.shields.io/maven-central/v/com.tencent.cloud/spring-cloud-tencent?label=Maven%20Central)](https://search.maven.org/search?q=g:com.tencent.cloud%20AND%20a:spring-cloud-tencent)
@@ -6,7 +6,7 @@
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
 
 [![Build Status](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml/badge.svg)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml)
-[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/main/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=main)
+[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/hoxton/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=hoxton)
 [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/Tencent/spring-cloud-tencent.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Tencent/spring-cloud-tencent/context:java)
 
 [English](./README.md) | 简体中文
diff --git a/README.md b/README.md
index 7fb3aa76..2cc606dc 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<img src="https://github.com/Tencent/spring-cloud-tencent/raw/main/doc/logo/rectangle-white.png" width="60%" height="60%"  alt="Spring-Cloud-Tencent-Logo"/>
+<img src="https://github.com/Tencent/spring-cloud-tencent/raw/hoxton/doc/logo/rectangle-white.png" width="60%" height="60%"  alt="Spring-Cloud-Tencent-Logo"/>
 
 
 [![Wiki](https://badgen.net/badge/icon/wiki?icon=wiki&label)](https://github.com/Tencent/spring-cloud-tencent/wiki)
@@ -7,7 +7,7 @@
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
 
 [![Build Status](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml/badge.svg)](https://github.com/Tencent/spring-cloud-tencent/actions/workflows/junit_test.yml)
-[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/main/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=main)
+[![codecov.io](https://codecov.io/gh/Tencent/spring-cloud-tencent/branch/hoxton/graph/badge.svg)](https://codecov.io/gh/Tencent/spring-cloud-tencent?branch=hoxton)
 [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/Tencent/spring-cloud-tencent.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Tencent/spring-cloud-tencent/context:java)
 
 English | [简体中文](./README-zh.md)
diff --git a/changes/changes-1.7.1.md b/changes/changes-1.7.1.md
new file mode 100644
index 00000000..5abef9df
--- /dev/null
+++ b/changes/changes-1.7.1.md
@@ -0,0 +1,32 @@
+# Change Log
+---
+
+- [Feature: support ribbon service-level rule customization](https://github.com/Tencent/spring-cloud-tencent/pull/478)
+- [Fix the code analysis error.](https://github.com/Tencent/spring-cloud-tencent/pull/479)
+- [Feature: delete implement ServiceInstance](https://github.com/Tencent/spring-cloud-tencent/pull/481)
+- [Upgrade owasp esapi's configuration](https://github.com/Tencent/spring-cloud-tencent/pull/492)
+- [Bugfix: update byte-buddy scope test to compile](https://github.com/Tencent/spring-cloud-tencent/pull/495)
+- [feature:add @ConditionalOnConfigReflectEnabled annotation](https://github.com/Tencent/spring-cloud-tencent/pull/496)
+- [Feature: zuul supports polaris router](https://github.com/Tencent/spring-cloud-tencent/pull/502)
+- [Feature：support pushGateway push metrics](https://github.com/Tencent/spring-cloud-tencent/pull/504)
+- [Refactor : optimize project and code](https://github.com/Tencent/spring-cloud-tencent/pull/506)
+- [Fix typo & Code optimization](https://github.com/Tencent/spring-cloud-tencent/pull/507)
+- [Code optimization for rpc-enhancement module](https://github.com/Tencent/spring-cloud-tencent/pull/510)
+- [Bugfix：BeanFactoryUtils returns all beans including beans defined in ancestor bean factories](https://github.com/Tencent/spring-cloud-tencent/pull/515)
+- [fix:fix only config file metadata can be used in routing bug.](https://github.com/Tencent/spring-cloud-tencent/pull/518)
+- [optimize：optimize config module code](https://github.com/Tencent/spring-cloud-tencent/pull/520)
+- [feat:optimize pushgateway plugin.](https://github.com/Tencent/spring-cloud-tencent/pull/530)
+- [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/535)
+- [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/541)
+- [fix:set error handler named EnhancedRestTemplateReporter for RestTemplate](https://github.com/Tencent/spring-cloud-tencent/pull/543)
+- [Fix issue: report the labels in request when report the result of invocation by Feign](https://github.com/Tencent/spring-cloud-tencent/pull/546)
+- [optimize：add switch for report call result and default false](https://github.com/Tencent/spring-cloud-tencent/pull/547)
+- [Optimize: refresh @Value by reflect and only refresh affected ConfigurationProperties beans](https://github.com/Tencent/spring-cloud-tencent/pull/548)
+- [feature:remove ConditionalOnConfigReflectEnabled annotation.](https://github.com/Tencent/spring-cloud-tencent/pull/551)
+- [Optimize:shutdown server when connect to config server failed.](https://github.com/Tencent/spring-cloud-tencent/pull/552)
+- [fix:fix heartbeat interval different configuration from polaris-java SDK.](https://github.com/Tencent/spring-cloud-tencent/pull/560)
+- [Optimize: optimize report call result for restTemplate.](https://github.com/Tencent/spring-cloud-tencent/pull/562)
+- [feat:add spring-cloud-starter-tencent-all and quickstart examples.](https://github.com/Tencent/spring-cloud-tencent/pull/567)
+- [fix:fix wrong internal config file load order.](https://github.com/Tencent/spring-cloud-tencent/pull/572)
+- [Optimize:change default dynamic config refresh type to reflect.](https://github.com/Tencent/spring-cloud-tencent/pull/573)
+- [feat:optimize examples.](https://github.com/Tencent/spring-cloud-tencent/pull/576)
diff --git a/pom.xml b/pom.xml
index 7da80d47..a00aa3c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
 	<version>${revision}</version>
 	<name>Spring Cloud Tencent</name>
 	<description>Spring Cloud Tencent</description>
-	<url>https://github.com/Tencent/spring-cloud-tencent/tree/main</url>
+	<url>https://github.com/Tencent/spring-cloud-tencent/tree/hoxton</url>
 
 	<organization>
 		<name>Tencent</name>
@@ -26,7 +26,7 @@
 	<licenses>
 		<license>
 			<name>The BSD 3-Clause License (BSD3)</name>
-			<url>https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/main/LICENSE</url>
+			<url>https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/hoxton/LICENSE</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
@@ -89,7 +89,7 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.7.1-Hoxton.SR12</revision>
+		<revision>1.8.0-Hoxton.SR12-SNAPSHOT</revision>
 
 		<!-- Spring Cloud -->
 		<spring.cloud.version>Hoxton.SR12</spring.cloud.version>
diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index 621cc49b..5ea18c1d 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -16,7 +16,7 @@
 	<packaging>pom</packaging>
 	<name>Spring Cloud Tencent Dependencies</name>
 	<description>Spring Cloud Tencent Dependencies</description>
-	<url>https://github.com/Tencent/spring-cloud-tencent/tree/main</url>
+	<url>https://github.com/Tencent/spring-cloud-tencent/tree/hoxton</url>
 
 	<organization>
 		<name>Tencent</name>
@@ -26,7 +26,7 @@
 	<licenses>
 		<license>
 			<name>The BSD 3-Clause License (BSD3)</name>
-			<url>https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/main/LICENSE</url>
+			<url>https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/hoxton/LICENSE</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
@@ -70,8 +70,8 @@
 	</developers>
 
 	<properties>
-		<revision>1.7.1-Hoxton.SR12</revision>
-		<polaris.version>1.7.4</polaris.version>
+		<revision>1.8.0-Hoxton.SR12-SNAPSHOT</revision>
+		<polaris.version>1.8.0-SNAPSHOT</polaris.version>
 		<logback.version>1.2.11</logback.version>
 		<mocktio.version>4.5.1</mocktio.version>
 		<byte-buddy.version>1.12.10</byte-buddy.version>