diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c7a9b9ad..5f87fd0c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,3 +7,4 @@
- [fix: fix ConfigChangeListener ut bug](https://github.com/Tencent/spring-cloud-tencent/pull/1659)
- [feat: support tsf gw.](https://github.com/Tencent/spring-cloud-tencent/pull/1697)
- [fix: tsf related bugfixes](https://github.com/Tencent/spring-cloud-tencent/pull/1698)
+- [fix: remove conflict dependencies management](https://github.com/Tencent/spring-cloud-tencent/pull/1699)
diff --git a/pom.xml b/pom.xml
index 4f469cf43..db062d521 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,6 +101,11 @@
2021.0.9
+
+ 1.14.19
+ 4.9.0
+ 2.0.2
+
0.8.12
3.2.0
@@ -153,6 +158,33 @@
pom
import
+
+
+ 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
+
diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index 58536b73f..4e4626959 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -74,14 +74,11 @@
2.1.0.0-2021.0.9-SNAPSHOT
- 2.0.3.0-SNAPSHOT
+ 2.1.0.0-SNAPSHOT
1.78.1
- 1.14.19
2.15.3
- 4.9.0
- 2.0.2
2.0
1.7.0
@@ -238,12 +235,6 @@
${springdoc.version}
-
- net.bytebuddy
- byte-buddy
- ${byte-buddy.version}
-
-
org.bouncycastle
bcpkix-jdk18on
@@ -262,27 +253,6 @@
${snakeyaml.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