Browse Source

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
pull/34503/head
Andy Wilkinson 3 years ago
parent
commit
5cef7632ee
  1. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/WebClientObservationConfigurationTests.java
  2. 2
      spring-boot-project/spring-boot-dependencies/build.gradle

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/WebClientObservationConfigurationTests.java

@ -146,7 +146,7 @@ class WebClientObservationConfigurationTests {
webClient.get().uri("https://example.org/projects/{project}", "spring-boot").retrieve().toBodilessEntity() webClient.get().uri("https://example.org/projects/{project}", "spring-boot").retrieve().toBodilessEntity()
.block(Duration.ofSeconds(30)); .block(Duration.ofSeconds(30));
TestObservationRegistryAssert.assertThat(registry).hasObservationWithNameEqualTo("http.client.requests").that() 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) { private WebClient mockWebClient(WebClient.Builder builder) {

2
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") { group("org.springframework") {
imports = [ imports = [
"spring-framework-bom" "spring-framework-bom"

Loading…
Cancel
Save