Skip to content

Commit 6ab4cf4

Browse files
committed
Merge branch '6.2.x'
2 parents 75ed4be + 87e04df commit 6ab4cf4

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Diff for: build.gradle

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

Diff for: framework-platform/framework-platform.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.0.alpha2"))
2020
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.1"))
2121
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.8.0"))
22-
api(platform("org.junit:junit-bom:5.12.1"))
22+
api(platform("org.junit:junit-bom:5.12.2"))
2323
api(platform("org.mockito:mockito-bom:5.17.0"))
2424

2525
constraints {

Diff for: spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientObservationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
*/
5454
class WebClientObservationTests {
5555

56-
5756
private final TestObservationRegistry observationRegistry = TestObservationRegistry.create();
5857

5958
private final ExchangeFunction exchangeFunction = mock();
@@ -63,6 +62,7 @@ class WebClientObservationTests {
6362
private WebClient.Builder builder;
6463

6564
@BeforeEach
65+
@SuppressWarnings("unchecked")
6666
void setup() {
6767
Hooks.enableAutomaticContextPropagation();
6868
ClientResponse mockResponse = mock();

0 commit comments

Comments
 (0)