diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index c662dedf78e..2cd5ebc5534 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -15,7 +15,7 @@ dependencies { api(platform("org.apache.groovy:groovy-bom:4.0.27")) api(platform("org.apache.logging.log4j:log4j-bom:3.0.0-beta3")) api(platform("org.assertj:assertj-bom:3.27.3")) - api(platform("org.eclipse.jetty:jetty-bom:12.1.0.beta0")) + api(platform("org.eclipse.jetty:jetty-bom:12.1.0.beta1")) api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.0.beta0")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.8.1")) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java index fc30214b993..e3ef05f2064 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java @@ -89,7 +89,7 @@ public class JettyWebSocketClient implements WebSocketClient, Lifecycle { @Override public Mono execute(URI url, @Nullable HttpHeaders headers, WebSocketHandler handler) { - ClientUpgradeRequest upgradeRequest = new ClientUpgradeRequest(); + ClientUpgradeRequest upgradeRequest = new ClientUpgradeRequest(url); upgradeRequest.setSubProtocols(handler.getSubProtocols()); if (headers != null) { headers.headerNames().forEach(header -> upgradeRequest.setHeader(header, headers.getValuesAsList(header))); @@ -110,7 +110,7 @@ public class JettyWebSocketClient implements WebSocketClient, Lifecycle { JettyWebSocketHandlerAdapter handlerAdapter = new JettyWebSocketHandlerAdapter(handler, session -> new JettyWebSocketSession(session, Objects.requireNonNull(handshakeInfo.get()), DefaultDataBufferFactory.sharedInstance, completion)); try { - this.client.connect(handlerAdapter, url, upgradeRequest, jettyUpgradeListener) + this.client.connect(handlerAdapter, upgradeRequest, jettyUpgradeListener) .exceptionally(throwable -> { // Only fail the completion if we have an error // as the JettyWebSocketSession will never be opened.