diff --git a/.gitignore b/.gitignore index 8894061..9044d0b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ target bin .idea out +.history/ diff --git a/build.gradle b/build.gradle index bb0491e..159b625 100644 --- a/build.gradle +++ b/build.gradle @@ -21,8 +21,8 @@ buildscript { } dependencies { classpath("io.spring.gradle:dependency-management-plugin:1.1.4") - classpath("org.jfrog.buildinfo:build-info-extractor-gradle:5.1.13") - classpath("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.40") + classpath("org.jfrog.buildinfo:build-info-extractor-gradle:5.2.0") + classpath("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.41") classpath("io.spring.nohttp:nohttp-gradle:${nohttpVersion}") } } @@ -260,4 +260,4 @@ def getProjectsWithSource() { def getJavaProjects() { subprojects - project(":spring-cloud-services-dependencies") -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index 3c59542..0793cbc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ version=4.1.1-SNAPSHOT parallel=true -springCloudVersion=2023.0.0 -springBootVersion=3.2.0 +springCloudVersion=2023.0.1 +springBootVersion=3.2.4 javaCfenvVersion=3.1.5 nohttpVersion=0.0.11 -wireMockVersion=3.3.1 +wireMockVersion=3.5.2 diff --git a/spring-cloud-services-config-client-autoconfigure/build.gradle b/spring-cloud-services-config-client-autoconfigure/build.gradle index de7a79b..b360e88 100644 --- a/spring-cloud-services-config-client-autoconfigure/build.gradle +++ b/spring-cloud-services-config-client-autoconfigure/build.gradle @@ -25,10 +25,9 @@ dependencies { testImplementation('org.springframework.boot:spring-boot-starter-test') testImplementation('org.junit.jupiter:junit-jupiter-api') - testImplementation('org.junit.vintage:junit-vintage-engine') testImplementation("org.springframework.cloud:spring-cloud-config-server") testImplementation("org.wiremock:wiremock-standalone:${wireMockVersion}") - testImplementation("org.awaitility:awaitility:4.2.0") + testImplementation("org.awaitility:awaitility:4.2.1") } publishing { diff --git a/spring-cloud-services-service-registry-autoconfigure/build.gradle b/spring-cloud-services-service-registry-autoconfigure/build.gradle index 4d84e49..39ac6eb 100644 --- a/spring-cloud-services-service-registry-autoconfigure/build.gradle +++ b/spring-cloud-services-service-registry-autoconfigure/build.gradle @@ -24,7 +24,6 @@ dependencies { testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation('org.junit.jupiter:junit-jupiter-api') - testImplementation('org.junit.vintage:junit-vintage-engine') testImplementation("org.springframework.boot:spring-boot-starter-web") testImplementation("org.wiremock:wiremock-standalone:${wireMockVersion}") } diff --git a/spring-cloud-services-service-registry-autoconfigure/src/main/java/io/pivotal/spring/cloud/service/registry/EurekaInstanceAutoConfiguration.java b/spring-cloud-services-service-registry-autoconfigure/src/main/java/io/pivotal/spring/cloud/service/registry/EurekaInstanceAutoConfiguration.java index 0fb7734..4078642 100644 --- a/spring-cloud-services-service-registry-autoconfigure/src/main/java/io/pivotal/spring/cloud/service/registry/EurekaInstanceAutoConfiguration.java +++ b/spring-cloud-services-service-registry-autoconfigure/src/main/java/io/pivotal/spring/cloud/service/registry/EurekaInstanceAutoConfiguration.java @@ -155,13 +155,13 @@ private static String zoneFromUri(String defaultZoneUri) { hostname = new URI(defaultZoneUri).getHost(); } catch (URISyntaxException e) { - LOGGER.warning(String.format(INDETERMINATE_EUREKA_ZONE_MESSAGE + " %s", DEFAULT_ZONE_PROPERTY, - defaultZoneUri, UNKNOWN_ZONE, e)); + LOGGER.warning((INDETERMINATE_EUREKA_ZONE_MESSAGE + " %s").formatted(DEFAULT_ZONE_PROPERTY, defaultZoneUri, + UNKNOWN_ZONE, e)); return UNKNOWN_ZONE; } if (hostname == null || !hostname.contains(".")) { - LOGGER.warning(String.format(INDETERMINATE_EUREKA_ZONE_MESSAGE, DEFAULT_ZONE_PROPERTY, defaultZoneUri, - UNKNOWN_ZONE)); + LOGGER.warning( + INDETERMINATE_EUREKA_ZONE_MESSAGE.formatted(DEFAULT_ZONE_PROPERTY, defaultZoneUri, UNKNOWN_ZONE)); return UNKNOWN_ZONE; } return hostname.substring(hostname.indexOf('.') + 1); diff --git a/spring-cloud-services-service-registry-autoconfigure/src/main/java/io/pivotal/spring/cloud/service/registry/SurgicalRoutingRequestTransformer.java b/spring-cloud-services-service-registry-autoconfigure/src/main/java/io/pivotal/spring/cloud/service/registry/SurgicalRoutingRequestTransformer.java index 9228243..36e3716 100644 --- a/spring-cloud-services-service-registry-autoconfigure/src/main/java/io/pivotal/spring/cloud/service/registry/SurgicalRoutingRequestTransformer.java +++ b/spring-cloud-services-service-registry-autoconfigure/src/main/java/io/pivotal/spring/cloud/service/registry/SurgicalRoutingRequestTransformer.java @@ -50,7 +50,7 @@ public HttpRequest transformRequest(HttpRequest request, ServiceInstance instanc return request; } - final var headerValue = String.format("%s:%s", metadata.get(CF_APP_GUID), metadata.get(CF_INSTANCE_INDEX)); + final var headerValue = "%s:%s".formatted(metadata.get(CF_APP_GUID), metadata.get(CF_INSTANCE_INDEX)); // request.getHeaders might be immutable, so return a wrapper return new HttpRequestWrapper(request) { diff --git a/spring-cloud-services-service-registry-autoconfigure/src/test/java/io/pivotal/spring/cloud/service/registry/EurekaClientOAuth2AutoConfigurationTest.java b/spring-cloud-services-service-registry-autoconfigure/src/test/java/io/pivotal/spring/cloud/service/registry/EurekaClientOAuth2AutoConfigurationTest.java index bc52b32..f52a27b 100644 --- a/spring-cloud-services-service-registry-autoconfigure/src/test/java/io/pivotal/spring/cloud/service/registry/EurekaClientOAuth2AutoConfigurationTest.java +++ b/spring-cloud-services-service-registry-autoconfigure/src/test/java/io/pivotal/spring/cloud/service/registry/EurekaClientOAuth2AutoConfigurationTest.java @@ -127,9 +127,9 @@ private String[] applicationProperties(String clientId, String clientSecret) { private String[] applicationProperties(String clientId, String clientSecret, String scope) { return new String[] { "eureka.client.oauth2.access-token-uri=http://uaa.local/token/uri", - String.format("eureka.client.oauth2.client-id=%s", clientId), - String.format("eureka.client.oauth2.client-secret=%s", clientSecret), - String.format("eureka.client.oauth2.scope=%s", scope), }; + "eureka.client.oauth2.client-id=%s".formatted(clientId), + "eureka.client.oauth2.client-secret=%s".formatted(clientSecret), + "eureka.client.oauth2.scope=%s".formatted(scope), }; } } \ No newline at end of file