diff --git a/pom.xml b/pom.xml index a2579ba6..b91ab8fc 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ - 1.13.0-Hoxton.SR12-SNAPSHOT + 1.13.0-Hoxton.SR12 5.2.25.RELEASE diff --git a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/adapter/MockedConfigKVFile.java b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/adapter/MockedConfigKVFile.java index 59e89ebc..bad8894a 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/adapter/MockedConfigKVFile.java +++ b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/adapter/MockedConfigKVFile.java @@ -138,6 +138,11 @@ public class MockedConfigKVFile implements ConfigKVFile { return false; } + @Override + public String getMd5() { + return null; + } + @Override public void addChangeListener(ConfigFileChangeListener configFileChangeListener) { diff --git a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/condition/ConditionalOnReflectRefreshTypeTest.java b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/condition/ConditionalOnReflectRefreshTypeTest.java index e50eac0c..ebde3e47 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/condition/ConditionalOnReflectRefreshTypeTest.java +++ b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/condition/ConditionalOnReflectRefreshTypeTest.java @@ -20,6 +20,7 @@ package com.tencent.cloud.polaris.config.condition; 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 @@ public class ConditionalOnReflectRefreshTypeTest { @AfterAll static void afterAll() throws IOException { - serverSocket.close(); + if (Objects.nonNull(serverSocket)) { + serverSocket.close(); + } } @Test diff --git a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/spring/annotation/SpringValueProcessorTest.java b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/spring/annotation/SpringValueProcessorTest.java index d4d30c2f..24439a72 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/spring/annotation/SpringValueProcessorTest.java +++ b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/spring/annotation/SpringValueProcessorTest.java @@ -22,6 +22,7 @@ import java.io.IOException; 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 @@ public class SpringValueProcessorTest { @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 index d55bb74c..15d28d12 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -70,10 +70,10 @@ - 1.13.0-Hoxton.SR12-SNAPSHOT + 1.13.0-Hoxton.SR12 - 1.15.0-SNAPSHOT + 1.15.0 32.0.1-jre 1.2.13 3.0.0