root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Upgrade to Jetty 12.1.0.beta1
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details 

Closes gh-35084
This commit is contained in:
Brian Clozel 2025-06-20 09:45:53 +02:00
parent c17b481939
commit 8448dc90a4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"))

4
spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java
View File

@ -89,7 +89,7 @@ public class JettyWebSocketClient implements WebSocketClient, Lifecycle {
@Override
public Mono<Void> 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.