fix:update dependencies.

Tencent · Jan 19, 2024 · ee0f990 · ee0f990
1 parent 18e9d5d
commit ee0f990
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.8</version>
+		<version>3.1.9</version>
 		<relativePath/>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -89,16 +89,16 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.13.0-2021.0.8-SNAPSHOT</revision>
+		<revision>1.13.0-2021.0.9-SNAPSHOT</revision>
 
 		<!-- Spring Framework -->
-		<spring.framework.version>5.3.25</spring.framework.version>
+		<spring.framework.version>5.3.31</spring.framework.version>
 
 		<!-- Spring Boot -->
-		<spring.boot.version>2.6.15</spring.boot.version>
+		<spring.boot.version>2.7.18</spring.boot.version>
 
 		<!-- Spring Cloud -->
-		<spring.cloud.version>2021.0.8</spring.cloud.version>
+		<spring.cloud.version>2021.0.9</spring.cloud.version>
 
 		<!-- Maven Plugin Versions -->
 		<jacoco.version>0.8.8</jacoco.version>

diff --git a/...ris-config/src/test/java/com/tencent/cloud/polaris/config/adapter/MockedConfigKVFile.java b/...ris-config/src/test/java/com/tencent/cloud/polaris/config/adapter/MockedConfigKVFile.java
@@ -138,6 +138,11 @@ public boolean hasContent() {
 		return false;
 	}
 
+	@Override
+	public String getMd5() {
+		return null;
+	}
+
 	@Override
 	public void addChangeListener(ConfigFileChangeListener configFileChangeListener) {
 

diff --git a/.../java/com/tencent/cloud/polaris/config/condition/ConditionalOnReflectRefreshTypeTest.java b/.../java/com/tencent/cloud/polaris/config/condition/ConditionalOnReflectRefreshTypeTest.java
@@ -20,6 +20,7 @@
 
 import java.io.IOException;
 import java.net.ServerSocket;
+import java.util.Objects;
 
 import com.tencent.cloud.polaris.config.PolarisConfigAutoConfiguration;
 import com.tencent.cloud.polaris.config.PolarisConfigBootstrapAutoConfiguration;
@@ -67,7 +68,9 @@ static void beforeAll() {
 
 	@AfterAll
 	static void afterAll() throws IOException {
-		serverSocket.close();
+		if (Objects.nonNull(serverSocket)) {
+			serverSocket.close();
+		}
 	}
 
 	@Test

diff --git a/...est/java/com/tencent/cloud/polaris/config/spring/annotation/SpringValueProcessorTest.java b/...est/java/com/tencent/cloud/polaris/config/spring/annotation/SpringValueProcessorTest.java
@@ -22,6 +22,7 @@
 import java.lang.reflect.Method;
 import java.net.ServerSocket;
 import java.util.Collection;
+import java.util.Objects;
 import java.util.Optional;
 
 import com.tencent.cloud.polaris.config.PolarisConfigBootstrapAutoConfiguration;
@@ -71,7 +72,9 @@ static void beforeAll() {
 
 	@AfterAll
 	static void afterAll() throws IOException {
-		serverSocket.close();
+		if (Objects.nonNull(serverSocket)) {
+			serverSocket.close();
+		}
 	}
 
 	@Test

diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
-		<version>3.1.8</version>
+		<version>3.1.9</version>
 		<relativePath/>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -70,7 +70,7 @@
 	</developers>
 
 	<properties>
-		<revision>1.13.0-2021.0.8-SNAPSHOT</revision>
+		<revision>1.13.0-2021.0.9-SNAPSHOT</revision>
 
 		<!-- Dependencies -->
 		<polaris.version>1.15.0-SNAPSHOT</polaris.version>

diff --git a/...-examples/quickstart-example/quickstart-callee-service-a/src/main/resources/bootstrap.yml b/...-examples/quickstart-example/quickstart-callee-service-a/src/main/resources/bootstrap.yml
@@ -14,7 +14,7 @@ spring:
       contract:
         exposure: true
         report:
-          enabled: false
+          enabled: true
       stat:
         enabled: true
         port: 28083

diff --git a/...-examples/quickstart-example/quickstart-callee-service-b/src/main/resources/bootstrap.yml b/...-examples/quickstart-example/quickstart-callee-service-b/src/main/resources/bootstrap.yml
@@ -14,7 +14,7 @@ spring:
       contract:
         exposure: true
         report:
-          enabled: false
+          enabled: true
       stat:
         enabled: true
         port: 28084

diff --git a/...nt-examples/quickstart-example/quickstart-caller-service/src/main/resources/bootstrap.yml b/...nt-examples/quickstart-example/quickstart-caller-service/src/main/resources/bootstrap.yml
@@ -17,7 +17,7 @@ spring:
       contract:
         exposure: true
         report:
-          enabled: false
+          enabled: true
       circuitbreaker:
         enabled: true
       stat:

diff --git a/...t-examples/quickstart-example/quickstart-gateway-service/src/main/resources/bootstrap.yml b/...t-examples/quickstart-example/quickstart-gateway-service/src/main/resources/bootstrap.yml
@@ -21,7 +21,7 @@ spring:
       contract:
         exposure: true
         report:
-          enabled: false
+          enabled: true
       stat:
         enabled: true
         port: 28081