From 94d5e11e7d0acb12853eb0cd5f902febf8a5478c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 15 Sep 2020 14:25:24 +0200 Subject: [PATCH 01/12] Upgrade to AppEngine SDK 1.9.82 Closes gh-23307 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index c9b0e3cc3e..d5e19ae8bf 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -60,7 +60,7 @@ bom { ] } } - library("AppEngine SDK", "1.9.81") { + library("AppEngine SDK", "1.9.82") { group("com.google.appengine") { modules = [ "appengine-api-1.0-sdk" From c9f413edfb5b65185e8445f7079db378d67ae7cd Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 15 Sep 2020 14:25:26 +0200 Subject: [PATCH 02/12] Upgrade to Couchbase Client 3.0.8 Closes gh-23308 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index d5e19ae8bf..651fe9d127 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -216,7 +216,7 @@ bom { ] } } - library("Couchbase Client", "3.0.7") { + library("Couchbase Client", "3.0.8") { group("com.couchbase.client") { modules = [ "java-client" From b1d33a3df9b283d1b2445c24bc2e513458b3a414 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 15 Sep 2020 14:25:27 +0200 Subject: [PATCH 03/12] Upgrade to Flatten Maven Plugin 1.2.5 Closes gh-23309 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 651fe9d127..ee28092a24 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -311,7 +311,7 @@ bom { ] } } - library("Flatten Maven Plugin", "1.2.4") { + library("Flatten Maven Plugin", "1.2.5") { group("org.codehaus.mojo") { plugins = [ "flatten-maven-plugin" From 9b3148ce3f1118d4f90d3155ca49840f49096cbd Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 15 Sep 2020 14:25:28 +0200 Subject: [PATCH 04/12] Upgrade to Hazelcast 3.12.9 Closes gh-23310 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index ee28092a24..5bdd8f27f2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -393,7 +393,7 @@ bom { ] } } - library("Hazelcast", "3.12.8") { + library("Hazelcast", "3.12.9") { group("com.hazelcast") { modules = [ "hazelcast", From 8738e05f59a3b33f39bd31edf687384053ff56e2 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 15 Sep 2020 14:25:29 +0200 Subject: [PATCH 05/12] Upgrade to Hibernate 5.4.21.Final Closes gh-23311 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 5bdd8f27f2..d340fd429a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -410,7 +410,7 @@ bom { ] } } - library("Hibernate", "5.4.20.Final") { + library("Hibernate", "5.4.21.Final") { group("org.hibernate") { modules = [ "hibernate-c3p0", From 71607777b1d7b441c2cf62f95eedecd4986224e1 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 15 Sep 2020 14:25:31 +0200 Subject: [PATCH 06/12] Upgrade to Neo4j OGM 3.2.16 Closes gh-23312 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index d340fd429a..93f1f7e7f2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1224,7 +1224,7 @@ bom { ] } } - library("Neo4j OGM", "3.2.14") { + library("Neo4j OGM", "3.2.16") { group("org.neo4j") { modules = [ "neo4j-ogm-api", From 201bfd2b0c76796c21dcc6860ae682935d693ecb Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 15 Sep 2020 14:25:32 +0200 Subject: [PATCH 07/12] 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 93f1f7e7f2..718ea84fae 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 cfea283408..d88a12099c 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) { From 9bf7555dcf967238e2adc1573aeaf6f77686cead Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 15 Sep 2020 14:25:33 +0200 Subject: [PATCH 08/12] Upgrade to Netty tcNative 2.0.34.Final Closes gh-23314 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 718ea84fae..1044e7c537 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1244,7 +1244,7 @@ bom { ] } } - library("Netty tcNative", "2.0.31.Final") { + library("Netty tcNative", "2.0.34.Final") { group("io.netty") { modules = [ "netty-tcnative-boringssl-static" From 3cb8a4fd5ac53f5edc956db1085fe53b4d5f23fe Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 15 Sep 2020 14:25:35 +0200 Subject: [PATCH 09/12] Upgrade to Postgresql 42.2.16 Closes gh-23315 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 1044e7c537..1f4f8dd6f9 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1366,7 +1366,7 @@ bom { ] } } - library("Postgresql", "42.2.14") { + library("Postgresql", "42.2.16") { group("org.postgresql") { modules = [ "postgresql" From 69576a3be24cfb1b32ab8c956b46753afadc6c04 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 15 Sep 2020 14:25:36 +0200 Subject: [PATCH 10/12] Upgrade to R2DBC Bom Arabba-SR7 Closes gh-23316 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 1f4f8dd6f9..b9441db9aa 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1404,7 +1404,7 @@ bom { ] } } - library("R2DBC Bom", "Arabba-SR6") { + library("R2DBC Bom", "Arabba-SR7") { group("io.r2dbc") { imports = [ "r2dbc-bom" From db3e81c5b7f23ab05ee76421791a14a46654adc2 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 15 Sep 2020 14:25:37 +0200 Subject: [PATCH 11/12] Upgrade to Tomcat 9.0.38 Closes gh-23317 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index b9441db9aa..be242b9a3c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1799,7 +1799,7 @@ bom { ] } } - library("Tomcat", "9.0.37") { + library("Tomcat", "9.0.38") { group("org.apache.tomcat") { modules = [ "tomcat-annotations-api", From 2df947cedb30b6b0c8825c6712587189447d8d67 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 15 Sep 2020 14:25:38 +0200 Subject: [PATCH 12/12] Upgrade to Undertow 2.1.4.Final Closes gh-23318 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index be242b9a3c..9abf9be599 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1823,7 +1823,7 @@ bom { ] } } - library("Undertow", "2.1.3.Final") { + library("Undertow", "2.1.4.Final") { group("io.undertow") { modules = [ "undertow-core",