From 492e1a4c0ff85e9a23dfe6beb8ebfb812718787a Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 14 Sep 2020 11:28:55 +0200
Subject: [PATCH] Upgrade to Netty 4.1.52.Final

Closes gh-23269
---
 spring-boot-project/spring-boot-dependencies/pom.xml        | 2 +-
 .../server/AbstractReactiveWebServerFactoryTests.java       | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 7f0ab7d416..1be34b8448 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -142,7 +142,7 @@
 		<mysql.version>8.0.21</mysql.version>
 		<nekohtml.version>1.9.22</nekohtml.version>
 		<neo4j-ogm.version>3.1.21</neo4j-ogm.version>
-		<netty.version>4.1.51.Final</netty.version>
+		<netty.version>4.1.52.Final</netty.version>
 		<netty-tcnative.version>2.0.34.Final</netty-tcnative.version>
 		<nio-multipart-parser.version>1.1.0</nio-multipart-parser.version>
 		<pooled-jms.version>1.0.6</pooled-jms.version>
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 8746030ebf..fa40204dbd 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
@@ -259,7 +259,11 @@ public abstract class AbstractReactiveWebServerFactoryTests {
 		Mono<String> result = client.post().uri("/test").contentType(MediaType.TEXT_PLAIN)
 				.body(BodyInserters.fromObject("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() {