Skip to content

Commit 3bedf42

Browse files
committed
Fix Jetty multipart client support with Java 25
Closes gh-35531
1 parent 79795c8 commit 3bedf42

2 files changed

Lines changed: 1 addition & 9 deletions

File tree

framework-platform/framework-platform.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
api(platform("org.apache.groovy:groovy-bom:5.0.1"))
1616
api(platform("org.apache.logging.log4j:log4j-bom:2.25.1"))
1717
api(platform("org.assertj:assertj-bom:3.27.6"))
18-
api(platform("org.eclipse.jetty:jetty-bom:12.1.2"))
18+
api(platform("org.eclipse.jetty:jetty-bom:12.1.3"))
1919
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.2"))
2020
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2"))
2121
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.9.0"))

spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MultipartWebClientIntegrationTests.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import com.fasterxml.jackson.annotation.JsonCreator;
2727
import com.fasterxml.jackson.annotation.JsonProperty;
28-
import org.junit.jupiter.api.condition.JRE;
2928
import reactor.core.publisher.Flux;
3029
import reactor.core.publisher.Mono;
3130
import reactor.core.scheduler.Schedulers;
@@ -61,10 +60,8 @@
6160
import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
6261
import org.springframework.web.testfixture.http.server.reactive.bootstrap.AbstractHttpHandlerIntegrationTests;
6362
import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
64-
import org.springframework.web.testfixture.http.server.reactive.bootstrap.JettyHttpServer;
6563

6664
import static org.assertj.core.api.Assertions.assertThat;
67-
import static org.assertj.core.api.Assumptions.assumeThat;
6865

6966
class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationTests {
7067

@@ -169,11 +166,6 @@ void filePartsMono(HttpServer httpServer) throws Exception {
169166

170167
@ParameterizedHttpServerTest
171168
void transferTo(HttpServer httpServer) throws Exception {
172-
// TODO https://github.com/spring-projects/spring-framework/issues/35531
173-
if (JRE.JAVA_25.isCurrentVersion()) {
174-
assumeThat(httpServer).isNotInstanceOf(JettyHttpServer.class);
175-
}
176-
177169
startServer(httpServer);
178170

179171
Flux<String> result = webClient

0 commit comments

Comments
 (0)