Skip to content

Commit 492e1a4

Browse files
committed
Upgrade to Netty 4.1.52.Final
Closes gh-23269
1 parent 3bd4337 commit 492e1a4

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

spring-boot-project/spring-boot-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
<mysql.version>8.0.21</mysql.version>
143143
<nekohtml.version>1.9.22</nekohtml.version>
144144
<neo4j-ogm.version>3.1.21</neo4j-ogm.version>
145-
<netty.version>4.1.51.Final</netty.version>
145+
<netty.version>4.1.52.Final</netty.version>
146146
<netty-tcnative.version>2.0.34.Final</netty-tcnative.version>
147147
<nio-multipart-parser.version>1.1.0</nio-multipart-parser.version>
148148
<pooled-jms.version>1.0.6</pooled-jms.version>

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,11 @@ protected void testClientAuthFailure(Ssl sslConfiguration, ReactorClientHttpConn
259259
Mono<String> result = client.post().uri("/test").contentType(MediaType.TEXT_PLAIN)
260260
.body(BodyInserters.fromObject("Hello World")).exchange()
261261
.flatMap((response) -> response.bodyToMono(String.class));
262-
StepVerifier.create(result).expectError(SSLException.class).verify(Duration.ofSeconds(10));
262+
StepVerifier.create(result).expectErrorSatisfies((exception) -> {
263+
if (!(exception instanceof SSLException)) {
264+
assertThat(exception).hasCauseInstanceOf(SSLException.class);
265+
}
266+
}).verify(Duration.ofSeconds(10));
263267
}
264268

265269
protected WebClient.Builder getWebClient() {

0 commit comments

Comments
 (0)