Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source
This commit is contained in:
Sam Brannen
2025-04-11 16:59:35 +02:00
parent 75ed4be446 87e04df983
commit 6ab4cf49a8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -80,7 +80,7 @@ configure([rootProject] + javaProjects) { project ->
"https://hc.apache.org/httpcomponents-client-5.4.x/current/httpclient5/apidocs/", "https://hc.apache.org/httpcomponents-client-5.4.x/current/httpclient5/apidocs/",
"https://projectreactor.io/docs/test/release/api/", "https://projectreactor.io/docs/test/release/api/",
"https://junit.org/junit4/javadoc/4.13.2/", "https://junit.org/junit4/javadoc/4.13.2/",
"https://junit.org/junit5/docs/5.12.1/api/", "https://junit.org/junit5/docs/5.12.2/api/",
"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/", "https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
//"https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/", //"https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/",
"https://r2dbc.io/spec/1.0.0.RELEASE/api/", "https://r2dbc.io/spec/1.0.0.RELEASE/api/",

2
framework-platform/framework-platform.gradle
View File

@@ -19,7 +19,7 @@ dependencies {
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.0.alpha2")) api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.0.alpha2"))
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.1")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.1"))
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.8.0")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.8.0"))
api(platform("org.junit:junit-bom:5.12.1")) api(platform("org.junit:junit-bom:5.12.2"))
api(platform("org.mockito:mockito-bom:5.17.0")) api(platform("org.mockito:mockito-bom:5.17.0"))
constraints { constraints {

2
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientObservationTests.java
View File

@@ -53,7 +53,6 @@ import static org.mockito.Mockito.when;
*/ */
class WebClientObservationTests { class WebClientObservationTests {
private final TestObservationRegistry observationRegistry = TestObservationRegistry.create(); private final TestObservationRegistry observationRegistry = TestObservationRegistry.create();
private final ExchangeFunction exchangeFunction = mock(); private final ExchangeFunction exchangeFunction = mock();
@@ -63,6 +62,7 @@ class WebClientObservationTests {
private WebClient.Builder builder; private WebClient.Builder builder;
@BeforeEach @BeforeEach
@SuppressWarnings("unchecked")
void setup() { void setup() {
Hooks.enableAutomaticContextPropagation(); Hooks.enableAutomaticContextPropagation();
ClientResponse mockResponse = mock(); ClientResponse mockResponse = mock();