admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Jetty multipart client support with Java 25

Browse Source 
Closes gh-35531
This commit is contained in:
Sébastien Deleuze
2025-10-21 12:43:10 +02:00
parent 79795c8e09
commit 3bedf42fbc
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework-platform/framework-platform.gradle
+1 -1
View File
@@ -15,7 +15,7 @@ dependencies {
api(platform("org.apache.groovy:groovy-bom:5.0.1"))
api(platform("org.apache.logging.log4j:log4j-bom:2.25.1"))
api(platform("org.assertj:assertj-bom:3.27.6"))
api(platform("org.eclipse.jetty:jetty-bom:12.1.2"))
api(platform("org.eclipse.jetty:jetty-bom:12.1.3"))
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.2"))
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2"))
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
-8
View File
@@ -25,7 +25,6 @@ import java.util.stream.Collectors;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.junit.jupiter.api.condition.JRE;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
@@ -61,10 +60,8 @@ import org.springframework.web.reactive.function.client.WebClient;
import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
import org.springframework.web.testfixture.http.server.reactive.bootstrap.AbstractHttpHandlerIntegrationTests;
import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
import org.springframework.web.testfixture.http.server.reactive.bootstrap.JettyHttpServer;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assumptions.assumeThat;
class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationTests {
@@ -169,11 +166,6 @@ class MultipartWebClientIntegrationTests extends AbstractHttpHandlerIntegrationT
@ParameterizedHttpServerTest
void transferTo(HttpServer httpServer) throws Exception {
// TODO https://github.com/spring-projects/spring-framework/issues/35531
if (JRE.JAVA_25.isCurrentVersion()) {
assumeThat(httpServer).isNotInstanceOf(JettyHttpServer.class);
}
startServer(httpServer);
Flux<String> result = webClient