From e559700eba78dfb81b6eaa0f555323d3370d8809 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Fri, 15 Aug 2025 10:32:24 +0800
Subject: [PATCH] fix: remove conflict dependencies management

---
 pom.xml                                   | 22 ++++++++++++++++++++++
 spring-cloud-tencent-dependencies/pom.xml | 22 ----------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index b54dac3ed..db062d521 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,6 +102,8 @@
 		<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 -->
@@ -157,6 +159,26 @@
 				<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>
diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index d65cac62c..4e4626959 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -78,9 +78,7 @@
 
 		<!-- 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>
 		<snakeyaml.version>2.0</snakeyaml.version>
 		<springdoc.version>1.7.0</springdoc.version>
 
@@ -237,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>
@@ -261,20 +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>
-
 			<!-- polaris SDK-->
 			<dependency>
 				<artifactId>polaris-all</artifactId>