Skip to content

Commit f4a84d3

Browse files
committed
Upgrade to Netty 4.1.52.Final
Closes gh-23287
1 parent a9f1441 commit f4a84d3

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
@@ -161,7 +161,7 @@
161161
<mysql.version>8.0.21</mysql.version>
162162
<nekohtml.version>1.9.22</nekohtml.version>
163163
<neo4j-ogm.version>3.2.14</neo4j-ogm.version>
164-
<netty.version>4.1.51.Final</netty.version>
164+
<netty.version>4.1.52.Final</netty.version>
165165
<netty-tcnative.version>2.0.31.Final</netty-tcnative.version>
166166
<nio-multipart-parser.version>1.1.0</nio-multipart-parser.version>
167167
<ojdbc.version>19.3.0.0</ojdbc.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
@@ -257,7 +257,11 @@ protected void testClientAuthFailure(Ssl sslConfiguration, ReactorClientHttpConn
257257
Mono<String> result = client.post().uri("/test").contentType(MediaType.TEXT_PLAIN)
258258
.body(BodyInserters.fromValue("Hello World")).exchange()
259259
.flatMap((response) -> response.bodyToMono(String.class));
260-
StepVerifier.create(result).expectError(SSLException.class).verify(Duration.ofSeconds(10));
260+
StepVerifier.create(result).expectErrorSatisfies((exception) -> {
261+
if (!(exception instanceof SSLException)) {
262+
assertThat(exception).hasCauseInstanceOf(SSLException.class);
263+
}
264+
}).verify(Duration.ofSeconds(10));
261265
}
262266

263267
protected WebClient.Builder getWebClient() {

0 commit comments

Comments
 (0)