diff --git a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/PolarisLoadBalancerCompositeRule.java b/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/PolarisLoadBalancerCompositeRule.java index dd7c26ae0..0460f5664 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/PolarisLoadBalancerCompositeRule.java +++ b/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; diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 16420197d..2c57094be 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -83,11 +83,6 @@ 2.15.3 2.0.2 1.33 - 2.9.1 - 2.1.10 - 6.2.5.Final - 3.0.2 - 3.0.4 3.3.0 @@ -106,14 +101,7 @@ import - - polaris-dependencies - com.tencent.polaris - ${polaris.version} - pom - import - - + com.tencent.cloud spring-cloud-tencent-commons @@ -199,12 +187,6 @@ ${revision} - - com.tencent.cloud - spring-cloud-tencent-featureenv-plugin - ${revision} - - com.tencent.cloud spring-cloud-starter-tencent-gateway-plugin @@ -263,17 +245,16 @@ org.springdoc - springdoc-openapi-ui + springdoc-openapi-webflux-ui ${springdoc.version} org.springdoc - springdoc-openapi-webflux-ui + springdoc-openapi-ui ${springdoc.version} - net.bytebuddy byte-buddy @@ -286,12 +267,6 @@ ${snakeyaml.version} - - com.google.code.gson - gson - ${gson.version} - - org.mockito mockito-inline @@ -313,6 +288,37 @@ test + + + polaris-all + com.tencent.polaris + ${polaris.version} + + + + polaris-threadlocal + com.tencent.polaris + ${polaris.version} + + + + com.tencent.polaris + connector-nacos + ${polaris.version} + + + + com.tencent.polaris + polaris-test-common + ${polaris.version} + test + + + com.tencent.polaris + polaris-test-mock-discovery + ${polaris.version} + test + diff --git a/spring-cloud-tencent-polaris-loadbalancer/pom.xml b/spring-cloud-tencent-polaris-loadbalancer/pom.xml index 165eeb328..da64c25d6 100644 --- a/spring-cloud-tencent-polaris-loadbalancer/pom.xml +++ b/spring-cloud-tencent-polaris-loadbalancer/pom.xml @@ -24,12 +24,6 @@ spring-cloud-starter-netflix-ribbon - - org.springframework - spring-web - test - - com.google.guava guava @@ -49,6 +43,11 @@ - + + org.springframework + spring-web + test + +