diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 236851eb..f04cb49c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -14,7 +14,7 @@ Other... Please describe: ## Adding the issue link (#xxx) if possible. ## Note diff --git a/CHANGELOG.md b/CHANGELOG.md index c1070584..aa0568c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,4 +6,5 @@ - [feat: SCT元数据管理能力与polaris-java元数据管理能力进行下沉及整合](https://github.com/Tencent/spring-cloud-tencent/pull/1249) - [feat: support lane router](https://github.com/Tencent/spring-cloud-tencent/pull/1250) - [feat: lane router rule support caller ip](https://github.com/Tencent/spring-cloud-tencent/pull/1253) -- [feat:add polaris ThreadLocal plugin.](https://github.com/Tencent/spring-cloud-tencent/pull/1255) \ No newline at end of file +- [feat:add polaris ThreadLocal plugin.](https://github.com/Tencent/spring-cloud-tencent/pull/1255) +- [feat:upgrade jackson version.](https://github.com/Tencent/spring-cloud-tencent/pull/1257) diff --git a/pom.xml b/pom.xml index ff792acb..110bbbf4 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ - 1.14.0-Hoxton.SR12-RC2 + 1.14.0-Hoxton.SR12-SNAPSHOT 5.2.25.RELEASE diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 157cc42f..1e5b3d61 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -70,10 +70,13 @@ - 1.14.0-Hoxton.SR12-RC2 + + 1.14.0-Hoxton.SR12-SNAPSHOT - + 1.15.3 + + 32.0.1-jre 1.2.13 3.0.0 @@ -94,13 +97,14 @@ - polaris-dependencies - com.tencent.polaris - ${polaris.version} + com.fasterxml.jackson + jackson-bom + ${jackson.version} pom import + com.tencent.cloud spring-cloud-tencent-commons @@ -131,7 +135,6 @@ ${revision} - com.tencent.cloud spring-cloud-starter-tencent-polaris-ratelimit @@ -238,24 +241,6 @@ ${logback.version} - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - io.springfox springfox-boot-starter @@ -307,6 +292,14 @@ test + + + polaris-dependencies + com.tencent.polaris + ${polaris.version} + pom + import +