From 02cbd0ae30acc2613818fcc2eb43c310a4373737 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <skyebefreeman@qq.com>
Date: Fri, 15 Aug 2025 10:48:34 +0800
Subject: [PATCH] fix: remove conflict dependencies management (#1699)

Co-authored-by: shedfreewu <49236872+shedfreewu@users.noreply.github.com>
---
 CHANGELOG.md                              |  1 +
 pom.xml                                   | 32 +++++++++++++++++++++++
 spring-cloud-tencent-dependencies/pom.xml | 32 +----------------------
 3 files changed, 34 insertions(+), 31 deletions(-)

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 @@
 		<!-- Spring Cloud -->
 		<spring.cloud.version>2021.0.9</spring.cloud.version>
 
+		<!-- Test -->
+		<byte-buddy.version>1.14.19</byte-buddy.version>
+		<mocktio.version>4.9.0</mocktio.version>
+		<system-stubs-jupiter.version>2.0.2</system-stubs-jupiter.version>
+
 		<!-- Maven Plugin Versions -->
 		<jacoco.version>0.8.12</jacoco.version>
 		<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
@@ -153,6 +158,33 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</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>
 		</dependencies>
 	</dependencyManagement>
 
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 @@
 		<revision>2.1.0.0-2021.0.9-SNAPSHOT</revision>
 
 		<!-- Polaris SDK version -->
-		<polaris.version>2.0.3.0-SNAPSHOT</polaris.version>
+		<polaris.version>2.1.0.0-SNAPSHOT</polaris.version>
 
 		<!-- Dependencies -->
 		<bcpkix-jdk18on.version>1.78.1</bcpkix-jdk18on.version>
-		<byte-buddy.version>1.14.19</byte-buddy.version>
 		<jackson.version>2.15.3</jackson.version>
-		<mocktio.version>4.9.0</mocktio.version>
-		<system-stubs-jupiter.version>2.0.2</system-stubs-jupiter.version>
 		<snakeyaml.version>2.0</snakeyaml.version>
 		<springdoc.version>1.7.0</springdoc.version>
 
@@ -238,12 +235,6 @@
 				<version>${springdoc.version}</version>
 			</dependency>
 
-			<dependency>
-				<groupId>net.bytebuddy</groupId>
-				<artifactId>byte-buddy</artifactId>
-				<version>${byte-buddy.version}</version>
-			</dependency>
-
 			<dependency>
 				<groupId>org.bouncycastle</groupId>
 				<artifactId>bcpkix-jdk18on</artifactId>
@@ -262,27 +253,6 @@
 				<version>${snakeyaml.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>