Merge branch '6.2.x'
This commit is contained in:
@@ -80,7 +80,7 @@ configure([rootProject] + javaProjects) { project ->
|
||||
"https://hc.apache.org/httpcomponents-client-5.4.x/current/httpclient5/apidocs/",
|
||||
"https://projectreactor.io/docs/test/release/api/",
|
||||
"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://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/",
|
||||
"https://r2dbc.io/spec/1.0.0.RELEASE/api/",
|
||||
|
||||
@@ -19,7 +19,7 @@ dependencies {
|
||||
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-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"))
|
||||
|
||||
constraints {
|
||||
|
||||
@@ -53,7 +53,6 @@ import static org.mockito.Mockito.when;
|
||||
*/
|
||||
class WebClientObservationTests {
|
||||
|
||||
|
||||
private final TestObservationRegistry observationRegistry = TestObservationRegistry.create();
|
||||
|
||||
private final ExchangeFunction exchangeFunction = mock();
|
||||
@@ -63,6 +62,7 @@ class WebClientObservationTests {
|
||||
private WebClient.Builder builder;
|
||||
|
||||
@BeforeEach
|
||||
@SuppressWarnings("unchecked")
|
||||
void setup() {
|
||||
Hooks.enableAutomaticContextPropagation();
|
||||
ClientResponse mockResponse = mock();
|
||||
|
||||
Reference in New Issue
Block a user