diff --git a/pom.xml b/pom.xml index 908c81076..3a136325f 100644 --- a/pom.xml +++ b/pom.xml @@ -82,10 +82,6 @@ Greenwich.SR6 - - 1.2.7 - 23.0 - 0.8.3 3.2.0 @@ -100,15 +96,6 @@ - - - org.springframework.cloud - spring-cloud-dependencies - ${spring.cloud.version} - pom - import - - com.tencent.cloud @@ -118,16 +105,13 @@ import + - ch.qos.logback - logback-classic - ${logback.version} - - - - com.google.guava - guava - ${guava.version} + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import diff --git a/spring-cloud-starter-tencent-polaris-discovery/pom.xml b/spring-cloud-starter-tencent-polaris-discovery/pom.xml index 4fca20c46..2ab637140 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/pom.xml +++ b/spring-cloud-starter-tencent-polaris-discovery/pom.xml @@ -15,70 +15,70 @@ - - com.tencent.cloud - spring-cloud-tencent-polaris-context - - + + com.tencent.cloud + spring-cloud-tencent-polaris-context + + - - - com.tencent.polaris - polaris-discovery-factory - + + + com.tencent.polaris + polaris-discovery-factory + - - com.tencent.polaris - polaris-test-common - test - + + com.tencent.polaris + polaris-test-common + test + - - com.tencent.polaris - polaris-test-mock-discovery - test - - + + com.tencent.polaris + polaris-test-mock-discovery + test + + - - org.springframework.cloud - spring-cloud-starter-netflix-ribbon - + + org.springframework.cloud + spring-cloud-starter-netflix-ribbon + - - org.springframework.boot - spring-boot-starter-web - true - + + org.springframework.boot + spring-boot-starter-web + true + - - org.springframework.boot - spring-boot-starter-webflux - true - + + org.springframework.boot + spring-boot-starter-webflux + true + - - org.springframework.boot - spring-boot-starter-test - test - + + org.springframework.boot + spring-boot-starter-test + test + - - io.projectreactor - reactor-test - test - + + io.projectreactor + reactor-test + test + - - org.powermock - powermock-module-junit4 - test - + + org.powermock + powermock-module-junit4 + test + - - org.powermock - powermock-api-mockito2 - test - - + + org.powermock + powermock-api-mockito2 + test + + diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index d8a30e6eb..e76ba54e9 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -64,6 +64,11 @@ 1.2.0-Greenwich-SNAPSHOT 1.3.1 + + + 1.2.7 + 23.0 + 1.4.5 2.0.0 @@ -83,6 +88,30 @@ import + + com.ecwid.consul + consul-api + ${consul.version} + + + servlet-api + javax.servlet + + + + + + ch.qos.logback + logback-classic + ${logback.version} + + + + com.google.guava + guava + ${guava.version} + + com.tencent.cloud spring-cloud-tencent-commons diff --git a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-b2/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-b2/src/main/resources/bootstrap.yml index fcea98bb3..71e433d90 100644 --- a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-b2/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-b2/src/main/resources/bootstrap.yml @@ -5,6 +5,6 @@ spring: name: polaris-circuitbreaker-example-b cloud: polaris: - address: grpc://9.134.122.18:8091 + address: grpc://localhost:8091 namespace: default is-throw-runtime-exception: true diff --git a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/pom.xml b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/pom.xml index 235ed173a..e93408d11 100644 --- a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/pom.xml +++ b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/pom.xml @@ -1,19 +1,19 @@ - - polaris-discovery-example - com.tencent.cloud - ${revision} - ../pom.xml - - 4.0.0 + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + polaris-discovery-example + com.tencent.cloud + ${revision} + ../pom.xml + + 4.0.0 - discovery-callee-service - Polaris Discovery Callee Service + discovery-callee-service + Polaris Discovery Callee Service - + com.tencent.cloud spring-cloud-starter-tencent-polaris-discovery @@ -29,32 +29,32 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.2.0 - - - attach-sources - - jar - - - - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.2.0 + + + attach-sources + + jar + + + + + +