begin 1.8.0-2020.0.5-SNAPSHOT. (#591)

3 years ago · 1e0f750731
parent 96ea11dbd3
commit 1e0f750731
7 changed files with 77 additions and 74 deletions
--- 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
+- [ ] Will Pull Request to branch of 2020.0 and hoxton.
+- [ ] Add documentation in javadoc in code or comment below the PR if necessary.
--- 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
--- 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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,39 +1,3 @@
 # Change Log
 ---

- [Bugfix: optimize ratelimit actuator](https://github.com/Tencent/spring-cloud-tencent/pull/419)
- [Feature: add rate limit filter debug log](https://github.com/Tencent/spring-cloud-tencent/pull/436)
- [Optimize: add EncodeTransferMedataRestTemplateInterceptor to RestTemplate](https://github.com/Tencent/spring-cloud-tencent/pull/439)
- [Add configurable heartbeat interval support](https://github.com/Tencent/spring-cloud-tencent/pull/443)
- [feat:enhance Feign and RestTemplate and support Polaris monitor.](https://github.com/Tencent/spring-cloud-tencent/pull/446)
- [Optimize feign & rest-template circuit-breaker logic](https://github.com/Tencent/spring-cloud-tencent/pull/453)
- [Bugfix: Removed unused class for circuit-breaker module](https://github.com/Tencent/spring-cloud-tencent/pull/456)
- [Feature: Add disposable metadata transfer support](https://github.com/Tencent/spring-cloud-tencent/pull/458)
- [loadBalancer module add unit test.](https://github.com/Tencent/spring-cloud-tencent/pull/468)
- [docs:update mvnw.](https://github.com/Tencent/spring-cloud-tencent/pull/475)
- [docs:update configuration metadata.](https://github.com/Tencent/spring-cloud-tencent/pull/473)
- [Feature: delete implement ServiceInstance](https://github.com/Tencent/spring-cloud-tencent/pull/482)
- [Bugfix: update byte-buddy scope test to compile](https://github.com/Tencent/spring-cloud-tencent/pull/497)
- [Fix the code analysis error.](https://github.com/Tencent/spring-cloud-tencent/pull/499)
- [Optimize router label resolver spi](https://github.com/Tencent/spring-cloud-tencent/pull/503)
- [Fix typo & Code optimization](https://github.com/Tencent/spring-cloud-tencent/pull/511)
- [BeanFactoryUtils returns all beans including beans defined in ancestor bean factories](https://github.com/Tencent/spring-cloud-tencent/pull/516)
- [Feature: Add router actuate endpoint](https://github.com/Tencent/spring-cloud-tencent/pull/519)
- [Code optimization for rpc-enhancement module](https://github.com/Tencent/spring-cloud-tencent/pull/525)
- [Feature: Optimized configuration update](https://github.com/Tencent/spring-cloud-tencent/pull/527)
- [Feature：support pushGateway push metrics](https://github.com/Tencent/spring-cloud-tencent/pull/531)
- [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/534)
- [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/540)
- [add feature-env plugin & add spring cloud gateway staining plugin](https://github.com/Tencent/spring-cloud-tencent/pull/532)
- [feature:add @ConditionalOnConfigReflectEnabled annotation](https://github.com/Tencent/spring-cloud-tencent/pull/538)
- [fix:set error handler named EnhancedRestTemplateReporter for RestTemplate](https://github.com/Tencent/spring-cloud-tencent/pull/544)
- [Optimize: add switch for report call result and default false](https://github.com/Tencent/spring-cloud-tencent/pull/549)
- [Optimize: shutdown server when connect to config server failed](https://github.com/Tencent/spring-cloud-tencent/pull/553)
- [Report the labels in request when report the result of invocation by Feign](https://github.com/Tencent/spring-cloud-tencent/pull/555)
- [fix:fix heartbeat interval different configuration from polaris-java SDK.](https://github.com/Tencent/spring-cloud-tencent/pull/558)
- [Optimize: optimize report call result for restTemplate.](https://github.com/Tencent/spring-cloud-tencent/pull/564)
- [feat:add spring-cloud-starter-tencent-all and quickstart examples.](https://github.com/Tencent/spring-cloud-tencent/pull/568)
- [refactor:optimize project and code.](https://github.com/Tencent/spring-cloud-tencent/pull/570)
- [Optimize:change default dynamic config refresh type to reflect.](https://github.com/Tencent/spring-cloud-tencent/pull/574)
- [feat:optimize examples.](https://github.com/Tencent/spring-cloud-tencent/pull/577)
- [fix:fix NullPointerException error when using RestTemplate with no label.](https://github.com/Tencent/spring-cloud-tencent/pull/585)
--- a/changes/changes-1.7.0.md
+++ b/changes/changes-1.7.0.md
@ -0,0 +1,39 @@
+# Change Log
+---
+
+- [Bugfix: optimize ratelimit actuator](https://github.com/Tencent/spring-cloud-tencent/pull/419)
+- [Feature: add rate limit filter debug log](https://github.com/Tencent/spring-cloud-tencent/pull/436)
+- [Optimize: add EncodeTransferMedataRestTemplateInterceptor to RestTemplate](https://github.com/Tencent/spring-cloud-tencent/pull/439)
+- [Add configurable heartbeat interval support](https://github.com/Tencent/spring-cloud-tencent/pull/443)
+- [feat:enhance Feign and RestTemplate and support Polaris monitor.](https://github.com/Tencent/spring-cloud-tencent/pull/446)
+- [Optimize feign & rest-template circuit-breaker logic](https://github.com/Tencent/spring-cloud-tencent/pull/453)
+- [Bugfix: Removed unused class for circuit-breaker module](https://github.com/Tencent/spring-cloud-tencent/pull/456)
+- [Feature: Add disposable metadata transfer support](https://github.com/Tencent/spring-cloud-tencent/pull/458)
+- [loadBalancer module add unit test.](https://github.com/Tencent/spring-cloud-tencent/pull/468)
+- [docs:update mvnw.](https://github.com/Tencent/spring-cloud-tencent/pull/475)
+- [docs:update configuration metadata.](https://github.com/Tencent/spring-cloud-tencent/pull/473)
+- [Feature: delete implement ServiceInstance](https://github.com/Tencent/spring-cloud-tencent/pull/482)
+- [Bugfix: update byte-buddy scope test to compile](https://github.com/Tencent/spring-cloud-tencent/pull/497)
+- [Fix the code analysis error.](https://github.com/Tencent/spring-cloud-tencent/pull/499)
+- [Optimize router label resolver spi](https://github.com/Tencent/spring-cloud-tencent/pull/503)
+- [Fix typo & Code optimization](https://github.com/Tencent/spring-cloud-tencent/pull/511)
+- [BeanFactoryUtils returns all beans including beans defined in ancestor bean factories](https://github.com/Tencent/spring-cloud-tencent/pull/516)
+- [Feature: Add router actuate endpoint](https://github.com/Tencent/spring-cloud-tencent/pull/519)
+- [Code optimization for rpc-enhancement module](https://github.com/Tencent/spring-cloud-tencent/pull/525)
+- [Feature: Optimized configuration update](https://github.com/Tencent/spring-cloud-tencent/pull/527)
+- [Feature：support pushGateway push metrics](https://github.com/Tencent/spring-cloud-tencent/pull/531)
+- [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/534)
+- [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/540)
+- [add feature-env plugin & add spring cloud gateway staining plugin](https://github.com/Tencent/spring-cloud-tencent/pull/532)
+- [feature:add @ConditionalOnConfigReflectEnabled annotation](https://github.com/Tencent/spring-cloud-tencent/pull/538)
+- [fix:set error handler named EnhancedRestTemplateReporter for RestTemplate](https://github.com/Tencent/spring-cloud-tencent/pull/544)
+- [Optimize: add switch for report call result and default false](https://github.com/Tencent/spring-cloud-tencent/pull/549)
+- [Optimize: shutdown server when connect to config server failed](https://github.com/Tencent/spring-cloud-tencent/pull/553)
+- [Report the labels in request when report the result of invocation by Feign](https://github.com/Tencent/spring-cloud-tencent/pull/555)
+- [fix:fix heartbeat interval different configuration from polaris-java SDK.](https://github.com/Tencent/spring-cloud-tencent/pull/558)
+- [Optimize: optimize report call result for restTemplate.](https://github.com/Tencent/spring-cloud-tencent/pull/564)
+- [feat:add spring-cloud-starter-tencent-all and quickstart examples.](https://github.com/Tencent/spring-cloud-tencent/pull/568)
+- [refactor:optimize project and code.](https://github.com/Tencent/spring-cloud-tencent/pull/570)
+- [Optimize:change default dynamic config refresh type to reflect.](https://github.com/Tencent/spring-cloud-tencent/pull/574)
+- [feat:optimize examples.](https://github.com/Tencent/spring-cloud-tencent/pull/577)
+- [fix:fix NullPointerException error when using RestTemplate with no label.](https://github.com/Tencent/spring-cloud-tencent/pull/585)
--- 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/2020.0</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/2020.0/LICENSE</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
@ -89,7 +89,7 @@

 	<properties>
 		<!-- Project revision -->
-		<revision>1.7.0-2020.0.5</revision>
+		<revision>1.8.0-2020.0.5-SNAPSHOT</revision>

 		<!-- Spring Cloud -->
 		<spring.cloud.version>2020.0.5</spring.cloud.version>
--- 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/2020.0</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/2020.0/LICENSE</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
@ -70,10 +70,10 @@
 	</developers>

 	<properties>
-		<revision>1.7.0-2020.0.5</revision>
+		<revision>1.8.0-2020.0.5-SNAPSHOT</revision>

 		<!-- Dependencies -->
-		<polaris.version>1.7.4</polaris.version>
+		<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>