From 5cef7632ee84fcdaa2f48299d0127efa293a07dc Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 15 Feb 2023 09:59:26 +0000 Subject: [PATCH] Start building against Spring Framework 6.0.5 snapshots This commit adapts to the changes made for spring-projects/spring-framework#29885. Closes gh-34152 --- .../web/client/WebClientObservationConfigurationTests.java | 2 +- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/WebClientObservationConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/WebClientObservationConfigurationTests.java index 28e09337eac2..9844942916ef 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/WebClientObservationConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/WebClientObservationConfigurationTests.java @@ -146,7 +146,7 @@ private void validateWebClient(WebClient.Builder builder, TestObservationRegistr webClient.get().uri("https://example.org/projects/{project}", "spring-boot").retrieve().toBodilessEntity() .block(Duration.ofSeconds(30)); TestObservationRegistryAssert.assertThat(registry).hasObservationWithNameEqualTo("http.client.requests").that() - .hasLowCardinalityKeyValue("uri", "https://example.org/projects/{project}"); + .hasLowCardinalityKeyValue("uri", "/projects/{project}"); } private WebClient mockWebClient(WebClient.Builder builder) { diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 05451c8ea071..c225933f511d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1355,7 +1355,7 @@ bom { ] } } - library("Spring Framework", "6.0.4") { + library("Spring Framework", "6.0.5-SNAPSHOT") { group("org.springframework") { imports = [ "spring-framework-bom"