Merge pull request #91 from SkyeBeFreeman/greenwich-new

fix:fix the bug that the consul version does not match

pom.xml

@@ -82,10 +82,6 @@
 		<!-- Spring Cloud -->
 		<spring.cloud.version>Greenwich.SR6</spring.cloud.version>
 
-		<!-- Dependencies -->
-		<logback.version>1.2.7</logback.version>
-		<guava.version>23.0</guava.version>
-
 		<!-- Maven Plugin Versions -->
 		<jacoco.version>0.8.3</jacoco.version>
 		<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
@@ -100,15 +96,6 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<!-- Spring Cloud Dependencies -->
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>${spring.cloud.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
 			<!-- Spring Cloud Tencent Dependencies -->
 			<dependency>
 				<groupId>com.tencent.cloud</groupId>
@@ -118,16 +105,13 @@
 				<scope>import</scope>
 			</dependency>
 
+			<!-- Spring Cloud Dependencies -->
 			<dependency>
-				<groupId>ch.qos.logback</groupId>
-				<artifactId>logback-classic</artifactId>
-				<version>${logback.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>com.google.guava</groupId>
-				<artifactId>guava</artifactId>
-				<version>${guava.version}</version>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring.cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

spring-cloud-tencent-dependencies/pom.xml

@@ -64,6 +64,11 @@
 	<properties>
 		<revision>1.2.0-Greenwich-SNAPSHOT</revision>
 		<polaris.version>1.3.1</polaris.version>
+
+		<!-- Dependencies -->
+		<logback.version>1.2.7</logback.version>
+		<guava.version>23.0</guava.version>
+		<consul.version>1.4.5</consul.version>
 		<powermock.version>2.0.0</powermock.version>
 
 		<!-- Maven Plugin Versions -->
@@ -83,6 +88,30 @@
 				<scope>import</scope>
 			</dependency>
 
+			<dependency>
+				<groupId>com.ecwid.consul</groupId>
+				<artifactId>consul-api</artifactId>
+				<version>${consul.version}</version>
+				<exclusions>
+					<exclusion>
+						<artifactId>servlet-api</artifactId>
+						<groupId>javax.servlet</groupId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+
+			<dependency>
+				<groupId>ch.qos.logback</groupId>
+				<artifactId>logback-classic</artifactId>
+				<version>${logback.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>com.google.guava</groupId>
+				<artifactId>guava</artifactId>
+				<version>${guava.version}</version>
+			</dependency>
+
 			<dependency>
 				<groupId>com.tencent.cloud</groupId>
 				<artifactId>spring-cloud-tencent-commons</artifactId>

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