Merge remote-tracking branch 'fuyuwei01/hoxton-6' into hoxton-6

spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/PolarisLoadBalancerCompositeRule.java

@@ -51,7 +51,7 @@ import com.tencent.polaris.api.pojo.ServiceInstances;
 import com.tencent.polaris.router.api.core.RouterAPI;
 import com.tencent.polaris.router.api.rpc.ProcessRoutersRequest;
 import com.tencent.polaris.router.api.rpc.ProcessRoutersResponse;
-import org.yaml.snakeyaml.util.UriEncoder;
+import shade.polaris.org.yaml.snakeyaml.util.UriEncoder;
 
 import org.springframework.http.HttpRequest;
 import org.springframework.util.CollectionUtils;

spring-cloud-tencent-dependencies/pom.xml

@@ -83,11 +83,6 @@
 		<jackson.version>2.15.3</jackson.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>
@@ -106,14 +101,7 @@
 				<scope>import</scope>
 			</dependency>
 
-			<dependency>
-				<artifactId>polaris-dependencies</artifactId>
-				<groupId>com.tencent.polaris</groupId>
-				<version>${polaris.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
+			<!-- polaris starter-->
 			<dependency>
 				<groupId>com.tencent.cloud</groupId>
 				<artifactId>spring-cloud-tencent-commons</artifactId>
@@ -199,12 +187,6 @@
 				<version>${revision}</version>
 			</dependency>
 
-			<dependency>
-				<groupId>com.tencent.cloud</groupId>
-				<artifactId>spring-cloud-tencent-featureenv-plugin</artifactId>
-				<version>${revision}</version>
-			</dependency>
-
 			<dependency>
 				<groupId>com.tencent.cloud</groupId>
 				<artifactId>spring-cloud-starter-tencent-gateway-plugin</artifactId>
@@ -263,17 +245,16 @@
 
 			<dependency>
 				<groupId>org.springdoc</groupId>
-				<artifactId>springdoc-openapi-ui</artifactId>
+				<artifactId>springdoc-openapi-webflux-ui</artifactId>
 				<version>${springdoc.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.springdoc</groupId>
-				<artifactId>springdoc-openapi-webflux-ui</artifactId>
+				<artifactId>springdoc-openapi-ui</artifactId>
 				<version>${springdoc.version}</version>
 			</dependency>
 
-
 			<dependency>
 				<groupId>net.bytebuddy</groupId>
 				<artifactId>byte-buddy</artifactId>
@@ -286,12 +267,6 @@
 				<version>${snakeyaml.version}</version>
 			</dependency>
 
-			<dependency>
-				<groupId>com.google.code.gson</groupId>
-				<artifactId>gson</artifactId>
-				<version>${gson.version}</version>
-			</dependency>
-
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-inline</artifactId>
@@ -313,6 +288,37 @@
 				<scope>test</scope>
 			</dependency>
 
+			<!-- polaris SDK-->
+			<dependency>
+				<artifactId>polaris-all</artifactId>
+				<groupId>com.tencent.polaris</groupId>
+				<version>${polaris.version}</version>
+			</dependency>
+
+			<dependency>
+				<artifactId>polaris-threadlocal</artifactId>
+				<groupId>com.tencent.polaris</groupId>
+				<version>${polaris.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>com.tencent.polaris</groupId>
+				<artifactId>connector-nacos</artifactId>
+				<version>${polaris.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>com.tencent.polaris</groupId>
+				<artifactId>polaris-test-common</artifactId>
+				<version>${polaris.version}</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>com.tencent.polaris</groupId>
+				<artifactId>polaris-test-mock-discovery</artifactId>
+				<version>${polaris.version}</version>
+				<scope>test</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

spring-cloud-tencent-polaris-loadbalancer/pom.xml

@@ -24,12 +24,6 @@
 			<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
@@ -49,6 +43,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-	</dependencies>
 
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 </project>