release 2.0.0.0. (#1488)

* release 2.0.0.0. --------- Co-authored-by: shedfreewu <[email protected]>
Tencent · Dec 18, 2024 · 472e5d5 · 472e5d5
1 parent 55122f0
commit 472e5d5
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -90,7 +90,7 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>2.0.0.0-Hoxton.SR12-SNAPSHOT</revision>
+		<revision>2.0.0.0-Hoxton.SR12</revision>
 
 		<!-- Spring Framework -->
 		<spring.framework.version>5.2.25.RELEASE</spring.framework.version>
@@ -100,6 +100,7 @@
 
 		<!-- Spring Cloud -->
 		<spring.cloud.version>Hoxton.SR12</spring.cloud.version>
+		<spring.cloud.netflix.version>2.2.10.RELEASE</spring.cloud.netflix.version>
 
 		<!-- Maven Plugin Versions -->
 		<jacoco.version>0.8.12</jacoco.version>
@@ -145,13 +146,23 @@
 			</dependency>
 
 			<!-- Spring Cloud Dependencies -->
+
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-netflix-dependencies</artifactId>
+				<version>${spring.cloud.netflix.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
 				<version>${spring.cloud.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+
 		</dependencies>
 	</dependencyManagement>
 

diff --git a/spring-cloud-starter-tencent-polaris-config/pom.xml b/spring-cloud-starter-tencent-polaris-config/pom.xml
@@ -62,11 +62,6 @@
 		</dependency>
 		<!-- Polaris dependencies end -->
 
-		<!-- Spring cloud dependencies start -->
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-context</artifactId>
-		</dependency>
 		<!-- Spring cloud dependencies start -->
 
 		<dependency>

diff --git a/spring-cloud-starter-tencent-polaris-discovery/pom.xml b/spring-cloud-starter-tencent-polaris-discovery/pom.xml
@@ -58,6 +58,12 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>spring-security-rsa</artifactId>
+					<groupId>org.springframework.security</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>

diff --git a/spring-cloud-tencent-commons/pom.xml b/spring-cloud-tencent-commons/pom.xml
@@ -15,7 +15,7 @@
 
 	<properties>
 		<commons.lang.version>2.6</commons.lang.version>
-		<commons.io.version>2.11.0</commons.io.version>
+		<commons.io.version>2.14.0</commons.io.version>
 	</properties>
 
 	<dependencies>
@@ -50,11 +50,6 @@
 			<artifactId>spring-boot-starter-json</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-validation</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter</artifactId>

diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
@@ -70,20 +70,26 @@
 	</developers>
 
 	<properties>
-		<revision>2.0.0.0-Hoxton.SR12-SNAPSHOT</revision>
+		<revision>2.0.0.0-Hoxton.SR12</revision>
 
 		<!-- Dependencies -->
-		<polaris.version>2.0.0.0-SNAPSHOT</polaris.version>
-		<guava.version>32.0.1-jre</guava.version>
+		<polaris.version>2.0.0.0</polaris.version>
+		<guava.version>32.1.3-jre</guava.version>
 		<logback.version>1.2.13</logback.version>
 		<springdoc.version>1.7.0</springdoc.version>
 		<io.swagger.version>1.5.24</io.swagger.version>
 		<mocktio.version>4.5.1</mocktio.version>
 		<byte-buddy.version>1.12.10</byte-buddy.version>
-		<jackson.version>2.12.7</jackson.version>
+		<jackson.version>2.15.3</jackson.version>
 		<protobuf-java.version>3.21.7</protobuf-java.version>
 		<joda-time.version>2.9.9</joda-time.version>
 		<system-stubs-jupiter.version>2.0.2</system-stubs-jupiter.version>
+		<snakeyaml.version>1.33</snakeyaml.version>
+		<gson.version>2.9.1</gson.version>
+		<HdrHistogram.version>2.1.10</HdrHistogram.version>
+		<hibernate-validator.version>6.2.5.Final</hibernate-validator.version>
+		<jsr305.version>3.0.2</jsr305.version>
+		<jakarta.el.version>3.0.4</jakarta.el.version>
 
 		<!-- Maven Plugin Versions -->
 		<maven-javadoc-plugin.verison>3.3.0</maven-javadoc-plugin.verison>
@@ -284,6 +290,42 @@
 				<version>${joda-time.version}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>org.yaml</groupId>
+				<artifactId>snakeyaml</artifactId>
+				<version>${snakeyaml.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>com.google.code.gson</groupId>
+				<artifactId>gson</artifactId>
+				<version>${gson.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.hdrhistogram</groupId>
+				<artifactId>HdrHistogram</artifactId>
+				<version>${HdrHistogram.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.hibernate.validator</groupId>
+				<artifactId>hibernate-validator</artifactId>
+				<version>${hibernate-validator.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>com.google.code.findbugs</groupId>
+				<artifactId>jsr305</artifactId>
+				<version>${jsr305.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.glassfish</groupId>
+				<artifactId>jakarta.el</artifactId>
+				<version>${jakarta.el.version}</version>
+			</dependency>
+
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-inline</artifactId>

diff --git a/spring-cloud-tencent-rpc-enhancement/pom.xml b/spring-cloud-tencent-rpc-enhancement/pom.xml
@@ -48,6 +48,12 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-loadbalancer</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>spring-security-crypto</artifactId>
+					<groupId>org.springframework.security</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>