From 70236a705a8b3827e819044d93ad52b758f71daa Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Fri, 8 Jul 2022 12:01:09 +0800
Subject: [PATCH] feat:update to 1.7.0-2021.0.3-SNAPSHOT. (#418)
---
CHANGELOG.md | 29 -----------------
changes/changes-1.6.0.md | 32 +++++++++++++++++++
pom.xml | 2 +-
spring-cloud-tencent-dependencies/pom.xml | 2 +-
.../service/callee/CustomMetadata.java | 3 +-
5 files changed, 36 insertions(+), 32 deletions(-)
create mode 100644 changes/changes-1.6.0.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b324e4f..06c1f817 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,32 +1,3 @@
# Change Log
---
-- [Upgrade: fix third-party lib CVEs & upgrade core spring libs version](https://github.com/Tencent/spring-cloud-tencent/pull/263)
-- [feat:support reading configuration from application.yml or application.properties.](https://github.com/Tencent/spring-cloud-tencent/pull/262)
-- [fix:fix ClassNotFoundException while not importing openfeign when using circuit-breaker module.](https://github.com/Tencent/spring-cloud-tencent/pull/271)
-- [fix:solve ratelimit-callee-service UnknownHostException.](https://github.com/Tencent/spring-cloud-tencent/pull/292)
-- [Feature: Add config change listener feature support](https://github.com/Tencent/spring-cloud-tencent/pull/299)
-- [Feature: Add config module unit test](https://github.com/Tencent/spring-cloud-tencent/pull/301)
-- [Feature:add restTemplate Report Polaris](https://github.com/Tencent/spring-cloud-tencent/pull/304)
-- [Update GitHub Actions workflow](https://github.com/Tencent/spring-cloud-tencent/pull/305)
-- [fix: use non-blocking call instead of blocking call](https://github.com/Tencent/spring-cloud-tencent/pull/309)
-- [solve the chaos code problem on rejectTips in 2021.0](https://github.com/Tencent/spring-cloud-tencent/pull/315)
-- [Fix config file format misspell](https://github.com/Tencent/spring-cloud-tencent/pull/321)
-- [Feature: Add instance metadata spi for registration](https://github.com/Tencent/spring-cloud-tencent/pull/324)
-- [Improve: Improve code style & Upgrade spring boot version with 2.6.9](https://github.com/Tencent/spring-cloud-tencent/pull/322)
-- [Feature: add spring cloud tencent logo](https://github.com/Tencent/spring-cloud-tencent/pull/332)
-- [UT: add metadata-transfer unit test](https://github.com/Tencent/spring-cloud-tencent/pull/335)
-- [feat:Add GitHub action of codecov.yml and update junit of metadata.](https://github.com/Tencent/spring-cloud-tencent/pull/344)
-- [Feature: optimize static metadata manager](https://github.com/Tencent/spring-cloud-tencent/pull/346)
-- [fix: shutdown thread pool before the container closes](https://github.com/Tencent/spring-cloud-tencent/pull/355)
-- [rm code: Condition 'null != interceptors' is always 'true' ](https://github.com/Tencent/spring-cloud-tencent/pull/357)
-- [docs:update logo in README.](https://github.com/Tencent/spring-cloud-tencent/pull/360)
-- [Use jdk constants instead of magic variables](https://github.com/Tencent/spring-cloud-tencent/pull/361)
-- [Refator JacksonUtils and JacksonUtilsTest](https://github.com/Tencent/spring-cloud-tencent/pull/367)
-- [Feature: support actuator for sct core components](https://github.com/Tencent/spring-cloud-tencent/pull/369)
-- [docs: Fix javadoc
error](https://github.com/Tencent/spring-cloud-tencent/pull/376)
-- [docs:optimize example](https://github.com/Tencent/spring-cloud-tencent/pull/387)
-- [Feature: support spring cloud gateway routers](https://github.com/Tencent/spring-cloud-tencent/pull/390)
-- [Optimize starter's auto-configuration](https://github.com/Tencent/spring-cloud-tencent/pull/396)
-- [test: add PostInitPolarisSDKContextTest](https://github.com/Tencent/spring-cloud-tencent/pull/403)
-- [refactor:optimize project and code](https://github.com/Tencent/spring-cloud-tencent/pull/407)
diff --git a/changes/changes-1.6.0.md b/changes/changes-1.6.0.md
new file mode 100644
index 00000000..5b324e4f
--- /dev/null
+++ b/changes/changes-1.6.0.md
@@ -0,0 +1,32 @@
+# Change Log
+---
+
+- [Upgrade: fix third-party lib CVEs & upgrade core spring libs version](https://github.com/Tencent/spring-cloud-tencent/pull/263)
+- [feat:support reading configuration from application.yml or application.properties.](https://github.com/Tencent/spring-cloud-tencent/pull/262)
+- [fix:fix ClassNotFoundException while not importing openfeign when using circuit-breaker module.](https://github.com/Tencent/spring-cloud-tencent/pull/271)
+- [fix:solve ratelimit-callee-service UnknownHostException.](https://github.com/Tencent/spring-cloud-tencent/pull/292)
+- [Feature: Add config change listener feature support](https://github.com/Tencent/spring-cloud-tencent/pull/299)
+- [Feature: Add config module unit test](https://github.com/Tencent/spring-cloud-tencent/pull/301)
+- [Feature:add restTemplate Report Polaris](https://github.com/Tencent/spring-cloud-tencent/pull/304)
+- [Update GitHub Actions workflow](https://github.com/Tencent/spring-cloud-tencent/pull/305)
+- [fix: use non-blocking call instead of blocking call](https://github.com/Tencent/spring-cloud-tencent/pull/309)
+- [solve the chaos code problem on rejectTips in 2021.0](https://github.com/Tencent/spring-cloud-tencent/pull/315)
+- [Fix config file format misspell](https://github.com/Tencent/spring-cloud-tencent/pull/321)
+- [Feature: Add instance metadata spi for registration](https://github.com/Tencent/spring-cloud-tencent/pull/324)
+- [Improve: Improve code style & Upgrade spring boot version with 2.6.9](https://github.com/Tencent/spring-cloud-tencent/pull/322)
+- [Feature: add spring cloud tencent logo](https://github.com/Tencent/spring-cloud-tencent/pull/332)
+- [UT: add metadata-transfer unit test](https://github.com/Tencent/spring-cloud-tencent/pull/335)
+- [feat:Add GitHub action of codecov.yml and update junit of metadata.](https://github.com/Tencent/spring-cloud-tencent/pull/344)
+- [Feature: optimize static metadata manager](https://github.com/Tencent/spring-cloud-tencent/pull/346)
+- [fix: shutdown thread pool before the container closes](https://github.com/Tencent/spring-cloud-tencent/pull/355)
+- [rm code: Condition 'null != interceptors' is always 'true' ](https://github.com/Tencent/spring-cloud-tencent/pull/357)
+- [docs:update logo in README.](https://github.com/Tencent/spring-cloud-tencent/pull/360)
+- [Use jdk constants instead of magic variables](https://github.com/Tencent/spring-cloud-tencent/pull/361)
+- [Refator JacksonUtils and JacksonUtilsTest](https://github.com/Tencent/spring-cloud-tencent/pull/367)
+- [Feature: support actuator for sct core components](https://github.com/Tencent/spring-cloud-tencent/pull/369)
+- [docs: Fix javadoc
error](https://github.com/Tencent/spring-cloud-tencent/pull/376)
+- [docs:optimize example](https://github.com/Tencent/spring-cloud-tencent/pull/387)
+- [Feature: support spring cloud gateway routers](https://github.com/Tencent/spring-cloud-tencent/pull/390)
+- [Optimize starter's auto-configuration](https://github.com/Tencent/spring-cloud-tencent/pull/396)
+- [test: add PostInitPolarisSDKContextTest](https://github.com/Tencent/spring-cloud-tencent/pull/403)
+- [refactor:optimize project and code](https://github.com/Tencent/spring-cloud-tencent/pull/407)
diff --git a/pom.xml b/pom.xml
index 232437d0..68b7c014 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
- 1.6.0-2021.0.3
+ 1.7.0-2021.0.3-SNAPSHOT
2021.0.3
diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index 58f3761e..ee0f7328 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -70,7 +70,7 @@
- 1.6.0-2021.0.3
+ 1.7.0-2021.0.3-SNAPSHOT
1.7.0
diff --git a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/java/com/tencent/cloud/polaris/discovery/service/callee/CustomMetadata.java b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/java/com/tencent/cloud/polaris/discovery/service/callee/CustomMetadata.java
index 9504e975..fbfa2261 100644
--- a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/java/com/tencent/cloud/polaris/discovery/service/callee/CustomMetadata.java
+++ b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/java/com/tencent/cloud/polaris/discovery/service/callee/CustomMetadata.java
@@ -27,7 +27,8 @@ import org.springframework.stereotype.Component;
/**
* custom metadata for instance.
- *@author lepdou 2022-06-16
+ *
+ * @author lepdou 2022-06-16
*/
@Component
public class CustomMetadata implements InstanceMetadataProvider {