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

Upgrade to Dysprosium snapshots 

See gh-24349
This commit is contained in:
Rossen Stoyanchev 2020-01-13 16:37:19 +00:00
parent 8a6086774f
commit 29fe65d23c
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@ -36,7 +36,7 @@ configure(allprojects) { project ->
imports {
mavenBom "com.fasterxml.jackson:jackson-bom:2.10.2"
mavenBom "io.netty:netty-bom:4.1.44.Final"
mavenBom "io.projectreactor:reactor-bom:Dysprosium-SR2"
mavenBom "io.projectreactor:reactor-bom:Dysprosium-BUILD-SNAPSHOT"
mavenBom "io.rsocket:rsocket-bom:1.0.0-RC5"
mavenBom "org.eclipse.jetty:jetty-bom:9.4.25.v20191220"
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.3.61"
@ -286,6 +286,7 @@ configure(allprojects) { project ->
}
repositories {
mavenCentral()
maven { url "https://repo.spring.io/snapshot" } // Reactor Dysprosium snapshots
maven { url "https://repo.spring.io/libs-spring-framework-build" }
}
}

7
spring-web/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java
View File

@ -18,6 +18,8 @@ package org.springframework.http.server.reactive;
import java.net.URI;
import org.junit.Assume;
import org.junit.jupiter.api.Assumptions;
import reactor.core.publisher.Mono;
import org.springframework.http.HttpStatus;
@ -27,6 +29,7 @@ import org.springframework.web.client.ResponseErrorHandler;
import org.springframework.web.client.RestTemplate;
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.ReactorHttpServer;
import static org.assertj.core.api.Assertions.assertThat;
@ -72,6 +75,10 @@ class ErrorHandlerIntegrationTests extends AbstractHttpHandlerIntegrationTests {
@ParameterizedHttpServerTest // SPR-15560
void emptyPathSegments(HttpServer httpServer) throws Exception {
/* Temporarily necessary for https://github.com/reactor/reactor-netty/issues/948 */
Assumptions.assumeFalse(httpServer instanceof ReactorHttpServer);
startServer(httpServer);
RestTemplate restTemplate = new RestTemplate();