From 86372fabbbeb9264b85d36a0dc3165b6a5e69464 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Wed, 23 Nov 2022 15:56:16 +0800
Subject: [PATCH] feat:update to Spring Cloud 2022 RC2. (#734)
---
CHANGELOG.md | 5 +--
changes/changes-1.4.3.md | 4 ---
changes/changes-1.5.2.md | 5 ---
changes/changes-1.5.3.md | 4 ---
changes/changes-1.6.0.md | 32 ------------------
changes/changes-1.7.0.md | 40 -----------------------
changes/changes-1.8.0.md | 24 --------------
pom.xml | 6 ++--
spring-cloud-tencent-dependencies/pom.xml | 2 +-
9 files changed, 7 insertions(+), 115 deletions(-)
delete mode 100644 changes/changes-1.4.3.md
delete mode 100644 changes/changes-1.5.2.md
delete mode 100644 changes/changes-1.5.3.md
delete mode 100644 changes/changes-1.6.0.md
delete mode 100644 changes/changes-1.7.0.md
delete mode 100644 changes/changes-1.8.0.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d102d7210..0d6de9d60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
# Change Log
---
--
-- [fix:fix transfer http headers not working bug.](https://github.com/Tencent/spring-cloud-tencent/pull/664)
+
+- [support 2022](https://github.com/Tencent/spring-cloud-tencent/pull/732)
+- [feat:update to Spring Cloud 2022 RC2.](https://github.com/Tencent/spring-cloud-tencent/pull/734)
diff --git a/changes/changes-1.4.3.md b/changes/changes-1.4.3.md
deleted file mode 100644
index e676dcbe0..000000000
--- a/changes/changes-1.4.3.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Change Log
----
-
-- [Upgrade spring boot version with 2.6.x and spring cloud version with 3.1.x](https://github.com/Tencent/spring-cloud-tencent/pull/195)
diff --git a/changes/changes-1.5.2.md b/changes/changes-1.5.2.md
deleted file mode 100644
index 6eeea5d38..000000000
--- a/changes/changes-1.5.2.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Change Log
----
-
-- [Add metadata transfer example.](https://github.com/Tencent/spring-cloud-tencent/pull/211)
-- [feat:merge features from 1.5.x-Hoxton.SR9.](https://github.com/Tencent/spring-cloud-tencent/pull/250)
diff --git a/changes/changes-1.5.3.md b/changes/changes-1.5.3.md
deleted file mode 100644
index 2052c69d8..000000000
--- a/changes/changes-1.5.3.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Change Log
----
-
-- [fix not load application.yml bug & fix guava version conflict bug](https://github.com/Tencent/spring-cloud-tencent/pull/289)
diff --git a/changes/changes-1.6.0.md b/changes/changes-1.6.0.md
deleted file mode 100644
index 5b324e4fa..000000000
--- a/changes/changes-1.6.0.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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.7.0.md b/changes/changes-1.7.0.md
deleted file mode 100644
index 185420071..000000000
--- a/changes/changes-1.7.0.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.8.0.md b/changes/changes-1.8.0.md
deleted file mode 100644
index fa589fc70..000000000
--- a/changes/changes-1.8.0.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Change Log
----
-
-- [Fix issue 593:When the project depends on spring-retry, executing restTemplate to call microservice and reporting NPE error](https://github.com/Tencent/spring-cloud-tencent/pull/594)
-- [Optimize: remove discovery module useless code](https://github.com/Tencent/spring-cloud-tencent/pull/595)
-- [Optimize: remove useless code for rest template router](https://github.com/Tencent/spring-cloud-tencent/pull/601)
-- [Optimize: optimize configuration conditional & optimize config data tips](https://github.com/Tencent/spring-cloud-tencent/pull/603)
-- [Automatically transmit some headers specified by an environment variable that directly defines header keys.](https://github.com/Tencent/spring-cloud-tencent/pull/606)
-- [Optimize: Maybe remove Chinese characters](https://github.com/Tencent/spring-cloud-tencent/pull/607)
-- [Optimize: InstanceId of PolarisRegistration and PolarisServiceRegistry](https://github.com/Tencent/spring-cloud-tencent/pull/610)
-- [ fix pr #606 cause ci fail](https://github.com/Tencent/spring-cloud-tencent/pull/613)
-- [fix pr 613: modify a judgment logic](https://github.com/Tencent/spring-cloud-tencent/pull/618)
-- [fix pr 606: modify a part of changes requested by review.](https://github.com/Tencent/spring-cloud-tencent/pull/620)
-- [Bugfix: fix feign report call result error when using feign direct call](https://github.com/Tencent/spring-cloud-tencent/pull/621)
-- [remove useless code for router](https://github.com/Tencent/spring-cloud-tencent/pull/626)
-- [Feature: support new label expression](https://github.com/Tencent/spring-cloud-tencent/pull/627)
-- [feat:report the labels when using RestTemplate.](https://github.com/Tencent/spring-cloud-tencent/pull/629)
-- [Bugfix: fix throw npe when router context is null](https://github.com/Tencent/spring-cloud-tencent/pull/635)
-- [Optimize:optimize transfer](https://github.com/Tencent/spring-cloud-tencent/pull/636)
-- [fix:cancel reporting useless metadata.](https://github.com/Tencent/spring-cloud-tencent/pull/639)
-- [Feature: support read config file from local file system](https://github.com/Tencent/spring-cloud-tencent/pull/640)
-- [fix:optimize expression parser V1.](https://github.com/Tencent/spring-cloud-tencent/pull/642)
-- [Optimize: add transfer metadata unit test.](https://github.com/Tencent/spring-cloud-tencent/pull/646)
-- [feat: publish spring event named ConfigChangeSpringEvent when the configuration is changed](https://github.com/Tencent/spring-cloud-tencent/pull/647)
diff --git a/pom.xml b/pom.xml
index 4743c94e2..61bb71352 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.springframework.cloud
spring-cloud-build
- 4.0.0-RC1
+ 4.0.0-RC2
4.0.0
@@ -92,13 +92,13 @@
1.8.1-2022.0.0-SNAPSHOT
- 2022.0.0-RC1
+ 2022.0.0-RC2
3.0.0-RC2
- 6.0.0-RC4
+ 6.0.0
0.8.8
diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index 8480d8ea7..d19ebb296 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -5,7 +5,7 @@
org.springframework.cloud
spring-cloud-dependencies-parent
- 4.0.0-RC1
+ 4.0.0-RC2
4.0.0