From 76fd9a530caf7e0f317267d160bf05469b50f5e9 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Sep 2020 09:47:47 +0200 Subject: [PATCH 01/13] Upgrade to Jackson 2.9.10.20200824 Closes gh-23266 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 3f9425d43d..6dc927fc92 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -82,7 +82,7 @@ 9.4.19.Final 2.14 - 2.9.10.20200621 + 2.9.10.20200824 ${jackson.version} 3.0.16 1.2.0 From fb935ecb8d056a43534d0ad2ee613ecf73be074f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Sep 2020 09:47:48 +0200 Subject: [PATCH 02/13] Upgrade to Appengine Sdk 1.9.82 Closes gh-23267 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 6dc927fc92..99a2d19fb6 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -36,7 +36,7 @@ 5.15.13 2.7.7 - 1.9.81 + 1.9.82 2.6.4 1.9.6 3.11.1 From e5a9a7ae83c9a159002fbfdf4103bdb943563e8e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Sep 2020 09:47:49 +0200 Subject: [PATCH 03/13] Upgrade to Micrometer 1.1.17 Closes gh-23268 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 99a2d19fb6..52f346382f 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -133,7 +133,7 @@ 1.2.3 1.18.12 2.3.0 - 1.1.16 + 1.1.17 1.9.13 2.23.4 1.9.2 From 6d99776d9dabff6d6f010cb02fe83b97ccc766f7 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Sep 2020 09:47:52 +0200 Subject: [PATCH 04/13] Upgrade to Netty Tcnative 2.0.34.Final Closes gh-23270 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 52f346382f..e6382d91e1 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -143,7 +143,7 @@ 1.9.22 3.1.20 4.1.51.Final - 2.0.31.Final + 2.0.34.Final 1.1.0 1.0.6 42.2.14 From 78c1e105ee20d9eefa23875190cf70efb3c63391 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Sep 2020 09:47:53 +0200 Subject: [PATCH 05/13] Upgrade to Dependency Management Plugin 1.0.10.RELEASE Closes gh-23271 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index e6382d91e1..94e598c346 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -53,7 +53,7 @@ 2.6.2 2.7.16 2.1.0 - 1.0.9.RELEASE + 1.0.10.RELEASE 10.14.2.0 1.6.1 4.0.7 From 9f0befbcb80e00d3e772fc8479c92ec39d42c0d1 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Sep 2020 09:47:55 +0200 Subject: [PATCH 06/13] Upgrade to Undertow 2.0.31.Final Closes gh-23272 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 94e598c346..b9cdbccc58 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -192,7 +192,7 @@ 3.0.4.RELEASE 9.0.37 4.0.14 - 2.0.30.Final + 2.0.31.Final 3325375 0.35 5.0.3 From c608f4425de87d684dc91b58cfe7a927a628da23 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Sep 2020 09:47:56 +0200 Subject: [PATCH 07/13] Upgrade to Jetty 9.4.31.v20200723 Closes gh-23273 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index b9cdbccc58..47b0b6115a 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -107,7 +107,7 @@ 2.9.3 2.27 6.3.1 - 9.4.30.v20200611 + 9.4.31.v20200723 2.2.0.v201112011158 8.5.54 1.0.3 From 738613b889f8b29a2b07434fca8290b965302b6c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Sep 2020 09:47:57 +0200 Subject: [PATCH 08/13] Upgrade to Hibernate 5.3.18.Final Closes gh-23274 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 47b0b6115a..7da2b60dc7 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -71,7 +71,7 @@ 1.3 3.11.7 1.2.3 - 5.3.17.Final + 5.3.18.Final 6.0.20.Final 3.2.0 2.4.1 From c723b4e705921dd6dc7bad4f910717607c162d5a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Sep 2020 09:47:59 +0200 Subject: [PATCH 09/13] Upgrade to Infinispan 9.4.20.Final Closes gh-23275 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 7da2b60dc7..839a1738b7 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -79,7 +79,7 @@ 4.1.4 4.5.12 4.4.13 - 9.4.19.Final + 9.4.20.Final 2.14 2.9.10.20200824 From 5c3947c64b2cf66baba8a8fe67f24cc301adee3f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Sep 2020 09:48:01 +0200 Subject: [PATCH 10/13] Upgrade to Neo4j Ogm 3.1.21 Closes gh-23276 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 839a1738b7..2f4627ccfc 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -141,7 +141,7 @@ 6.4.0.jre8 8.0.21 1.9.22 - 3.1.20 + 3.1.21 4.1.51.Final 2.0.34.Final 1.1.0 From 72a5b2353d58441bcd3c51c369fdb91c5094e71f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Sep 2020 09:48:03 +0200 Subject: [PATCH 11/13] Upgrade to Postgresql 42.2.16 Closes gh-23277 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 2f4627ccfc..a2ecf0a88a 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -146,7 +146,7 @@ 2.0.34.Final 1.1.0 1.0.6 - 42.2.14 + 42.2.16 0.5.0 2.3.2 4.2.2 From 3bd4337a4e9fb4d510554f1749c66103809ff007 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Sep 2020 09:48:04 +0200 Subject: [PATCH 12/13] Upgrade to Spring Security 5.1.12.RELEASE Closes gh-23278 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index a2ecf0a88a..7f0ab7d416 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -178,7 +178,7 @@ 1.2.0.RELEASE 2.0.4.RELEASE 1.2.5.RELEASE - 5.1.11.RELEASE + 5.1.12.RELEASE Bean-BUILD-SNAPSHOT 3.0.9.RELEASE 3.25.2 From 492e1a4c0ff85e9a23dfe6beb8ebfb812718787a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Sep 2020 11:28:55 +0200 Subject: [PATCH 13/13] 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 @@ 8.0.21 1.9.22 3.1.21 - 4.1.51.Final + 4.1.52.Final 2.0.34.Final 1.1.0 1.0.6 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 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() {