diff --git a/pom.xml b/pom.xml index 243d9f3e..31cbf13c 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ - 1.1.2.Hoxton.SR9 + 1.1.3.Hoxton.SR9 Hoxton.SR9 diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 35429955..0f054379 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -62,7 +62,7 @@ - 1.1.2.Hoxton.SR9 + 1.1.3.Hoxton.SR9 1.2.0 10.0.0-M6 2.0.0 diff --git a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/pom.xml b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/pom.xml index 3fab0034..e3372c51 100644 --- a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/pom.xml +++ b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/pom.xml @@ -37,17 +37,6 @@ com.tencent.cloud spring-cloud-starter-tencent-polaris-router - - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - io.github.openfeign - feign-okhttp - diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml index 1c827dab..fddba87f 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml @@ -40,25 +40,21 @@ org.springframework.cloud spring-cloud-starter-openfeign - true io.github.openfeign feign-core - true org.springframework.cloud spring-cloud-openfeign-core - true org.springframework.cloud spring-cloud-loadbalancer - true @@ -69,27 +65,23 @@ org.springframework.boot spring-boot-configuration-processor - true org.springframework.boot spring-boot-autoconfigure - true org.springframework.boot spring-boot-starter-test test - true org.springframework.cloud spring-cloud-starter-netflix-ribbon test - true diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml index 5072ede2..9c01bb30 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/pom.xml @@ -53,79 +53,67 @@ org.springframework.boot spring-boot-configuration-processor - true org.springframework.boot spring-boot-starter-webflux - true org.springframework spring-context-support - true org.springframework.cloud spring-cloud-starter-openfeign - true org.springframework.cloud spring-cloud-starter-netflix-ribbon - true org.springframework.cloud spring-cloud-config-client - true org.springframework.cloud spring-cloud-config-server - true org.springframework.boot spring-boot-starter-web test - true org.springframework.boot spring-boot-starter-test test - true io.projectreactor reactor-test test - true org.powermock powermock-module-junit4 test - true org.powermock powermock-api-mockito2 test - true \ No newline at end of file diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-ratelimit/pom.xml b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-ratelimit/pom.xml index 11957340..c186c238 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-ratelimit/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-ratelimit/pom.xml @@ -41,90 +41,76 @@ com.tencent.polaris polaris-test-common test - true com.tencent.polaris polaris-test-mock-discovery test - true org.springframework.boot spring-boot - true org.springframework.cloud spring-cloud-commons - true org.springframework spring-webmvc - true org.springframework.boot spring-boot-autoconfigure - true org.apache.tomcat.embed tomcat-embed-core - true org.springframework.cloud spring-cloud-starter-openfeign - true org.springframework.cloud spring-cloud-starter-netflix-ribbon - true org.springframework.cloud spring-cloud-context - true io.github.openfeign feign-hystrix - true org.springframework.boot spring-boot-starter-test test - true org.powermock powermock-module-junit4 test - true org.powermock powermock-api-mockito2 test - true \ No newline at end of file diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-router/pom.xml b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-router/pom.xml index 93cda9a4..afed7670 100644 --- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-router/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-router/pom.xml @@ -47,20 +47,17 @@ org.springframework.cloud spring-cloud-starter-netflix-ribbon - true org.springframework.cloud spring-cloud-starter-openfeign - true org.springframework.boot spring-boot-starter-test test - true diff --git a/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml b/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml index 8769a16a..7dd913d3 100644 --- a/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml @@ -30,13 +30,16 @@ org.springframework.boot spring-boot - true + + + + com.google.guava + guava org.springframework.cloud spring-cloud-starter-netflix-ribbon - true diff --git a/spring-cloud-tencent-starters/spring-cloud-tencent-feign/pom.xml b/spring-cloud-tencent-starters/spring-cloud-tencent-feign/pom.xml index fdfe663c..d1caf42d 100644 --- a/spring-cloud-tencent-starters/spring-cloud-tencent-feign/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-tencent-feign/pom.xml @@ -24,25 +24,21 @@ org.springframework.boot spring-boot - true org.springframework.boot spring-boot-configuration-processor - true org.springframework.boot spring-boot-autoconfigure - true org.springframework.cloud spring-cloud-starter-openfeign - true diff --git a/spring-cloud-tencent-starters/spring-cloud-tencent-metadata/pom.xml b/spring-cloud-tencent-starters/spring-cloud-tencent-metadata/pom.xml index e326c6bd..0aae55ab 100644 --- a/spring-cloud-tencent-starters/spring-cloud-tencent-metadata/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-tencent-metadata/pom.xml @@ -29,44 +29,37 @@ org.springframework.boot spring-boot - true org.springframework.boot spring-boot-configuration-processor - true org.springframework.boot spring-boot-autoconfigure - true org.springframework.boot spring-boot-starter-web - true org.springframework.boot spring-boot-starter-webflux - true org.springframework.cloud spring-cloud-starter-openfeign - true org.springframework.boot spring-boot-starter-test test - true @@ -74,7 +67,6 @@ org.powermock powermock-module-junit4 test - true @@ -82,7 +74,6 @@ org.powermock powermock-api-mockito2 test - true diff --git a/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-context/pom.xml b/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-context/pom.xml index 7cb4611e..df997a5a 100644 --- a/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-context/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-context/pom.xml @@ -90,25 +90,21 @@ org.springframework.boot spring-boot-configuration-processor - true org.springframework.boot spring-boot - true org.springframework.boot spring-boot-autoconfigure - true org.springframework.boot spring-boot-starter - true diff --git a/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-gateway/pom.xml b/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-gateway/pom.xml index 261bd215..c59adcea 100644 --- a/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-gateway/pom.xml +++ b/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-gateway/pom.xml @@ -34,13 +34,11 @@ org.springframework.cloud spring-cloud-starter-netflix-zuul - true org.springframework.cloud spring-cloud-starter-gateway - true