From 120704314fa969147d5740ef198f52784eb6b7ca Mon Sep 17 00:00:00 2001
From: SkyeBeFreeman <928016560@qq.com>
Date: Fri, 17 Sep 2021 10:58:23 +0800
Subject: [PATCH] docs:optimize Maven dependencies
---
pom.xml | 4 +-
spring-cloud-tencent-dependencies/pom.xml | 4 +-
spring-cloud-tencent-starters/pom.xml | 7 ++++
.../pom.xml | 31 --------------
.../pom.xml | 40 +++---------------
.../pom.xml | 41 ++-----------------
.../pom.xml | 10 -----
.../rule/PolarisWeightedRandomRule.java | 1 -
.../spring-cloud-tencent-commons/pom.xml | 18 ++++++--
.../spring-cloud-tencent-feign/pom.xml | 22 ----------
.../spring-cloud-tencent-metadata/pom.xml | 31 ++++----------
.../pom.xml | 32 ---------------
.../pom.xml | 7 +---
13 files changed, 43 insertions(+), 205 deletions(-)
diff --git a/pom.xml b/pom.xml
index 31cbf13c..efba570c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
- 1.1.3.Hoxton.SR9
+ 1.1.4.Hoxton.SR9-SNAPSHOT
Hoxton.SR9
@@ -79,7 +79,7 @@
0.8.3
3.2.0
- 1.1.0
+ 1.2.7
diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index 0f054379..7922fa66 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -62,7 +62,7 @@
- 1.1.3.Hoxton.SR9
+ 1.1.4.Hoxton.SR9-SNAPSHOT
1.2.0
10.0.0-M6
2.0.0
@@ -70,7 +70,7 @@
3.2.0
3.1.1
- 1.1.0
+ 1.2.7
1.6
diff --git a/spring-cloud-tencent-starters/pom.xml b/spring-cloud-tencent-starters/pom.xml
index 6b6325b5..035095a7 100644
--- a/spring-cloud-tencent-starters/pom.xml
+++ b/spring-cloud-tencent-starters/pom.xml
@@ -27,6 +27,13 @@
spring-cloud-tencent-polaris-gateway
+
+
+ com.tencent.cloud
+ spring-cloud-tencent-commons
+
+
+
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 fddba87f..e753a07a 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
@@ -37,41 +37,11 @@
-
- org.springframework.cloud
- spring-cloud-starter-openfeign
-
-
-
- io.github.openfeign
- feign-core
-
-
-
- org.springframework.cloud
- spring-cloud-openfeign-core
-
-
org.springframework.cloud
spring-cloud-loadbalancer
-
- org.springframework.cloud
- spring-cloud-commons
-
-
-
- org.springframework.boot
- spring-boot-configuration-processor
-
-
-
- org.springframework.boot
- spring-boot-autoconfigure
-
-
org.springframework.boot
spring-boot-starter-test
@@ -83,6 +53,5 @@
spring-cloud-starter-netflix-ribbon
test
-
\ No newline at end of file
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 9c01bb30..83117e99 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
@@ -15,11 +15,6 @@
-
- com.tencent.cloud
- spring-cloud-tencent-commons
-
-
com.tencent.cloud
spring-cloud-tencent-metadata
@@ -50,46 +45,21 @@
-
- org.springframework.boot
- spring-boot-configuration-processor
-
-
-
- org.springframework.boot
- spring-boot-starter-webflux
-
-
-
- org.springframework
- spring-context-support
-
-
-
-
- org.springframework.cloud
- spring-cloud-starter-openfeign
-
-
org.springframework.cloud
spring-cloud-starter-netflix-ribbon
- org.springframework.cloud
- spring-cloud-config-client
-
-
-
- org.springframework.cloud
- spring-cloud-config-server
+ org.springframework.boot
+ spring-boot-starter-web
+ true
org.springframework.boot
- spring-boot-starter-web
- test
+ spring-boot-starter-webflux
+ true
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 c186c238..ba9073fe 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
@@ -52,52 +52,19 @@
org.springframework.boot
- spring-boot
-
-
-
- org.springframework.cloud
- spring-cloud-commons
-
-
-
- org.springframework
- spring-webmvc
+ spring-boot-starter-web
+ true
org.springframework.boot
- spring-boot-autoconfigure
-
-
-
- org.apache.tomcat.embed
- tomcat-embed-core
-
-
-
- org.springframework.cloud
- spring-cloud-starter-openfeign
+ spring-boot-starter-test
+ test
org.springframework.cloud
spring-cloud-starter-netflix-ribbon
-
-
-
- org.springframework.cloud
- spring-cloud-context
-
-
-
- io.github.openfeign
- feign-hystrix
-
-
-
- org.springframework.boot
- spring-boot-starter-test
test
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 afed7670..fb7788a1 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
@@ -15,11 +15,6 @@
-
- com.tencent.cloud
- spring-cloud-tencent-commons
-
-
com.tencent.cloud
spring-cloud-tencent-metadata
@@ -49,11 +44,6 @@
spring-cloud-starter-netflix-ribbon
-
- org.springframework.cloud
- spring-cloud-starter-openfeign
-
-
org.springframework.boot
spring-boot-starter-test
diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/rule/PolarisWeightedRandomRule.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/rule/PolarisWeightedRandomRule.java
index a950fb53..d9dffa23 100644
--- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/rule/PolarisWeightedRandomRule.java
+++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/rule/PolarisWeightedRandomRule.java
@@ -15,7 +15,6 @@
* specific language governing permissions and limitations under the License.
*/
-
package com.tencent.cloud.polaris.router.rule;
import com.netflix.client.config.IClientConfig;
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 7dd913d3..66d33281 100644
--- a/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml
+++ b/spring-cloud-tencent-starters/spring-cloud-tencent-commons/pom.xml
@@ -29,17 +29,27 @@
org.springframework.boot
- spring-boot
+ spring-boot-autoconfigure
- com.google.guava
- guava
+ org.springframework.boot
+ spring-boot-configuration-processor
org.springframework.cloud
- spring-cloud-starter-netflix-ribbon
+ spring-cloud-commons
+
+
+
+ com.netflix.ribbon
+ ribbon-loadbalancer
+
+
+
+ com.google.guava
+ guava
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 d1caf42d..2cc5a976 100644
--- a/spring-cloud-tencent-starters/spring-cloud-tencent-feign/pom.xml
+++ b/spring-cloud-tencent-starters/spring-cloud-tencent-feign/pom.xml
@@ -14,28 +14,6 @@
Spring Cloud Tencent Feign
-
-
- com.tencent.cloud
- spring-cloud-tencent-commons
-
-
-
-
- org.springframework.boot
- spring-boot
-
-
-
- org.springframework.boot
- spring-boot-configuration-processor
-
-
-
- org.springframework.boot
- spring-boot-autoconfigure
-
-
org.springframework.cloud
spring-cloud-starter-openfeign
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 0aae55ab..2d9ffc1a 100644
--- a/spring-cloud-tencent-starters/spring-cloud-tencent-metadata/pom.xml
+++ b/spring-cloud-tencent-starters/spring-cloud-tencent-metadata/pom.xml
@@ -15,50 +15,33 @@
-
- com.tencent.cloud
- spring-cloud-tencent-commons
-
-
com.tencent.cloud
spring-cloud-tencent-feign
-
- org.springframework.boot
- spring-boot
-
-
-
- org.springframework.boot
- spring-boot-configuration-processor
-
-
-
- org.springframework.boot
- spring-boot-autoconfigure
-
-
org.springframework.boot
spring-boot-starter-web
+ true
org.springframework.boot
spring-boot-starter-webflux
+ true
- org.springframework.cloud
- spring-cloud-starter-openfeign
+ org.springframework.boot
+ spring-boot-starter-test
+ test
- org.springframework.boot
- spring-boot-starter-test
+ org.springframework.cloud
+ spring-cloud-starter-netflix-ribbon
test
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 df997a5a..80c4dbce 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
@@ -14,13 +14,6 @@
Spring Cloud Tencent Polaris SDKContext
-
-
- com.tencent.cloud
- spring-cloud-tencent-commons
-
-
-
com.tencent.polaris
@@ -87,31 +80,6 @@
-
- org.springframework.boot
- spring-boot-configuration-processor
-
-
-
- org.springframework.boot
- spring-boot
-
-
-
- org.springframework.boot
- spring-boot-autoconfigure
-
-
-
- org.springframework.boot
- spring-boot-starter
-
-
-
- org.springframework
- spring-context-support
-
-
org.springframework.cloud
spring-cloud-commons
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 c59adcea..deeed96d 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
@@ -15,11 +15,6 @@
-
- com.tencent.cloud
- spring-cloud-tencent-commons
-
-
com.tencent.cloud
spring-cloud-tencent-metadata
@@ -34,11 +29,13 @@
org.springframework.cloud
spring-cloud-starter-netflix-zuul
+ true
org.springframework.cloud
spring-cloud-starter-gateway
+ true