From f389f66270d4ba8623c47fb09250b9856e896d0f Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 22 Dec 2017 12:50:15 -0500 Subject: [PATCH] Upgrade to Reactor Bismuth snapshots This allows us to confirm 0.7.3 fixes and run tests against the latest ahead of an upgrade to Reactor Netty 0.8 snapshots. The fix for #231 and #240 are confirmed but unfortunately test case for --- build.gradle | 4 ++-- .../RequestMappingExceptionHandlingIntegrationTests.java | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 44787e1cea..2055b22813 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ configure(allprojects) { project -> ext.kotlinVersion = "1.2.10" ext.log4jVersion = "2.10.0" ext.nettyVersion = "4.1.19.Final" - ext.reactorVersion = "Bismuth-SR4" + ext.reactorVersion = "Bismuth-BUILD-SNAPSHOT" ext.rxjavaVersion = "1.3.4" ext.rxjavaAdapterVersion = "1.2.1" ext.rxjava2Version = "2.1.7" @@ -131,7 +131,7 @@ configure(allprojects) { project -> repositories { maven { url "https://repo.spring.io/libs-release" } - maven { url "https://repo.spring.io/milestone" } // for AspectJ 1.9 beta + maven { url "https://repo.spring.io/snapshot" } // for AspectJ 1.9 beta and Reactor snapshots } dependencies { diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingExceptionHandlingIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingExceptionHandlingIntegrationTests.java index 9c1f226e5d..9f3bfb3a98 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingExceptionHandlingIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingExceptionHandlingIntegrationTests.java @@ -77,10 +77,6 @@ public class RequestMappingExceptionHandlingIntegrationTests extends AbstractReq @Test // SPR-16051 public void exceptionAfterSeveralItems() throws Exception { - - // TODO: uncomment and try after https://github.com/reactor/reactor-netty/issues/231 - Assume.assumeFalse(server instanceof ReactorHttpServer); - try { performGet("/SPR-16051", new HttpHeaders(), String.class).getBody(); fail();