diff --git a/README.adoc b/README.adoc index 83062c93..2991a3d1 100644 --- a/README.adoc +++ b/README.adoc @@ -264,7 +264,7 @@ The refresh endpoint reports that the "sample" property changed. == Building -:jdkversion: 1.8 +:jdkversion: 17 === Basic Compile and Test diff --git a/pom.xml b/pom.xml index ac0e9332..12441257 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.1 + 3.1.2-SNAPSHOT diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java index 523ffba8..434b514f 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java @@ -71,7 +71,8 @@ public class ConfigServerConfigDataLocationResolver ConfigClientProperties configClientProperties; if (context.getBootstrapContext().isRegistered(ConfigClientProperties.class)) { configClientProperties = new ConfigClientProperties(); - BeanUtils.copyProperties(context.getBootstrapContext().get(ConfigClientProperties.class), configClientProperties); + BeanUtils.copyProperties(context.getBootstrapContext().get(ConfigClientProperties.class), + configClientProperties); } else { configClientProperties = binder diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java index faf74039..12d569ea 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java @@ -189,9 +189,9 @@ public class ConfigServerConfigDataLocationResolverTests { when(bootstrapContext.get(eq(ConfigClientProperties.class))).thenReturn(configClientProperties); when(context.getBootstrapContext()).thenReturn(bootstrapContext); List resources1 = this.resolver.resolveProfileSpecific(context, - ConfigDataLocation.of("configserver:http://urlNo1"), mock(Profiles.class)); + ConfigDataLocation.of("configserver:http://urlNo1"), mock(Profiles.class)); List resources2 = this.resolver.resolveProfileSpecific(context, - ConfigDataLocation.of("configserver:http://urlNo2"), mock(Profiles.class)); + ConfigDataLocation.of("configserver:http://urlNo2"), mock(Profiles.class)); assertThat(resources1).hasSize(1); assertThat(resources2).hasSize(1); verify(bootstrapContext, times(2)).get(eq(ConfigClientProperties.class));