From b069deac7590e8308e41b71e1b6cf87ee2df5995 Mon Sep 17 00:00:00 2001
From: shedfreewu <shedfreewu@tencent.com>
Date: Tue, 22 Jul 2025 21:08:17 +0800
Subject: [PATCH] fix: remove conflict dependencies management

---
 CHANGELOG.md                              |  1 +
 pom.xml                                   | 10 ++++++
 spring-cloud-tencent-dependencies/pom.xml | 39 -----------------------
 3 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ea490551..b061a4337 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,3 +6,4 @@
 - [fix: fix ConfigChangeListener and unit test](https://github.com/Tencent/spring-cloud-tencent/pull/1657)
 - [fix: fix ConfigChangeListener ut bug](https://github.com/Tencent/spring-cloud-tencent/pull/1663)
 - [fix: tsf 2024 related bugfixes](https://github.com/Tencent/spring-cloud-tencent/pull/1664)
+- [fix: remove conflict dependencies management](https://github.com/Tencent/spring-cloud-tencent/pull/1669)
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e88de2ce3..986513c6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,6 +101,9 @@
 		<!-- Spring Cloud -->
 		<spring.cloud.version>2024.0.1</spring.cloud.version>
 
+		<!-- Test -->
+		<system-stubs-jupiter.version>2.0.2</system-stubs-jupiter.version>
+
 		<!-- Maven Plugin Versions -->
 		<jacoco.version>0.8.12</jacoco.version>
 		<flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
@@ -151,6 +154,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+
+			<dependency>
+				<groupId>uk.org.webcompere</groupId>
+				<artifactId>system-stubs-jupiter</artifactId>
+				<version>${system-stubs-jupiter.version}</version>
+				<scope>test</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index 478a7b7ce..d8706df3b 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -78,10 +78,6 @@
 
 		<!-- Dependencies -->
 		<springdoc.version>2.2.0</springdoc.version>
-		<mocktio.version>4.9.0</mocktio.version>
-		<byte-buddy.version>1.14.19</byte-buddy.version>
-		<jackson.version>2.15.4</jackson.version>
-		<system-stubs-jupiter.version>2.0.2</system-stubs-jupiter.version>
 
 		<!-- Maven Plugin Versions -->
 		<flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
@@ -90,14 +86,6 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>com.fasterxml.jackson</groupId>
-				<artifactId>jackson-bom</artifactId>
-				<version>${jackson.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
 			<!-- polaris starter-->
 			<dependency>
 				<groupId>com.tencent.cloud</groupId>
@@ -227,33 +215,6 @@
 				<version>${springdoc.version}</version>
 			</dependency>
 
-			<dependency>
-				<groupId>net.bytebuddy</groupId>
-				<artifactId>byte-buddy</artifactId>
-				<version>${byte-buddy.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.mockito</groupId>
-				<artifactId>mockito-inline</artifactId>
-				<version>${mocktio.version}</version>
-				<scope>test</scope>
-			</dependency>
-
-			<dependency>
-				<groupId>org.mockito</groupId>
-				<artifactId>mockito-core</artifactId>
-				<version>${mocktio.version}</version>
-				<scope>test</scope>
-			</dependency>
-
-			<dependency>
-				<groupId>uk.org.webcompere</groupId>
-				<artifactId>system-stubs-jupiter</artifactId>
-				<version>${system-stubs-jupiter.version}</version>
-				<scope>test</scope>
-			</dependency>
-
 			<!-- polaris SDK-->
 			<dependency>
 				<artifactId>polaris-all</artifactId>