diff --git a/CHANGELOG.md b/CHANGELOG.md index a7b3cf61f..2bad27d57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,3 +8,4 @@ - [fix: fix ConfigChangeListener and unit test](https://github.com/Tencent/spring-cloud-tencent/pull/1656) - [feat: support spring-retry and feign config refresh and feign eager load support schema](https://github.com/Tencent/spring-cloud-tencent/pull/1651) - [fix: fix ConfigChangeListener ut bug](https://github.com/Tencent/spring-cloud-tencent/pull/1661) +- [fix: remove conflict dependencies management](https://github.com/Tencent/spring-cloud-tencent/pull/1683) diff --git a/pom.xml b/pom.xml index c8efd80a4..51613fb54 100644 --- a/pom.xml +++ b/pom.xml @@ -101,6 +101,9 @@ 2023.0.6 + + 2.0.2 + 0.8.12 1.3.0 @@ -151,6 +154,13 @@ pom import + + + uk.org.webcompere + system-stubs-jupiter + ${system-stubs-jupiter.version} + test + diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index d00450260..923b27869 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -78,10 +78,6 @@ 2.2.0 - 4.9.0 - 1.14.19 - 2.15.4 - 2.0.2 1.3.0 @@ -90,14 +86,6 @@ - - com.fasterxml.jackson - jackson-bom - ${jackson.version} - pom - import - - com.tencent.cloud @@ -227,33 +215,6 @@ ${springdoc.version} - - net.bytebuddy - byte-buddy - ${byte-buddy.version} - - - - org.mockito - mockito-inline - ${mocktio.version} - test - - - - org.mockito - mockito-core - ${mocktio.version} - test - - - - uk.org.webcompere - system-stubs-jupiter - ${system-stubs-jupiter.version} - test - - polaris-all