From 201bfd2b0c76796c21dcc6860ae682935d693ecb Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 15 Sep 2020 14:25:32 +0200 Subject: [PATCH] Upgrade to Netty 4.1.52.Final Closes gh-23313 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../server/AbstractReactiveWebServerFactoryTests.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 93f1f7e7f2a..718ea84fae4 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1237,7 +1237,7 @@ bom { ] } } - library("Netty", "4.1.51.Final") { + library("Netty", "4.1.52.Final") { group("io.netty") { imports = [ "netty-bom" diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java index cfea2834085..d88a12099c1 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java @@ -268,7 +268,11 @@ public abstract class AbstractReactiveWebServerFactoryTests { Mono result = client.post().uri("/test").contentType(MediaType.TEXT_PLAIN) .body(BodyInserters.fromValue("Hello World")).exchange() .flatMap((response) -> response.bodyToMono(String.class)); - StepVerifier.create(result).expectError(SSLException.class).verify(Duration.ofSeconds(10)); + StepVerifier.create(result).expectErrorSatisfies((exception) -> { + if (!(exception instanceof SSLException)) { + assertThat(exception).hasCauseInstanceOf(SSLException.class); + } + }).verify(Duration.ofSeconds(10)); } protected WebClient.Builder getWebClient(int port) {