From dea7e34699f90e5d3c243d93163ffda11d94aa22 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:09:49 +0100 Subject: [PATCH 01/40] Switch bomr to any policy --- 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 fec98af323..4d54bfcbc2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -9,7 +9,7 @@ description = "Spring Boot Dependencies" bom { effectiveBomArtifact() upgrade { - policy = "same-minor-version" + policy = "any" gitHub { issueLabels = ["type: dependency-upgrade"] } From e3b36b4c7ed483d28238725c3fcca9167eec513c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:03 +0100 Subject: [PATCH 02/40] Upgrade to AppEngine SDK 1.9.93 Closes gh-29202 --- 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 4d54bfcbc2..373f568923 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -63,7 +63,7 @@ bom { ] } } - library("AppEngine SDK", "1.9.92") { + library("AppEngine SDK", "1.9.93") { group("com.google.appengine") { modules = [ "appengine-api-1.0-sdk" From ecf620fb0156776f0fbcabc52f37b7608e34d9af Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:04 +0100 Subject: [PATCH 03/40] Prevent upgrade to Artemis 2.20.0+ See gh-29203 --- spring-boot-project/spring-boot-dependencies/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 373f568923..15a8f011b7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -71,6 +71,9 @@ bom { } } library("Artemis", "2.19.0") { + prohibit("[2.20.0,)") { + because "it requires Java 11" + } group("org.apache.activemq") { modules = [ "artemis-amqp-protocol", From 8a440b02a681d804b4e8bbaad53324e97de4dae9 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:06 +0100 Subject: [PATCH 04/40] Upgrade to AssertJ 3.22.0 Closes gh-29204 --- 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 15a8f011b7..c98804c568 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -108,7 +108,7 @@ bom { ] } } - library("AssertJ", "3.21.0") { + library("AssertJ", "3.22.0") { group("org.assertj") { modules = [ "assertj-core" From 2ac9381be43d03ff8e4217f960a5e3721a0c84e7 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:07 +0100 Subject: [PATCH 05/40] Upgrade to Byte Buddy 1.12.6 Closes gh-29205 --- 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 c98804c568..99e8a3b650 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -144,7 +144,7 @@ bom { ] } } - library("Byte Buddy", "1.11.22") { + library("Byte Buddy", "1.12.6") { group("net.bytebuddy") { modules = [ "byte-buddy", From 91ac6008e0e4fc507a3bdde2d14805bbcbce5608 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:08 +0100 Subject: [PATCH 06/40] Upgrade to Caffeine 2.9.3 Closes gh-29206 --- 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 99e8a3b650..e1ac0f5220 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -152,7 +152,7 @@ bom { ] } } - library("Caffeine", "2.9.2") { + library("Caffeine", "2.9.3") { prohibit("[3.0.0,)") { because "it requires Java 11" } From e4c7251d233b8a0c6dd289d1ca34d1a6d8dc8f16 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:09 +0100 Subject: [PATCH 07/40] Upgrade to Couchbase Client 3.2.4 Closes gh-29207 --- 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 e1ac0f5220..6bad5afdda 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -221,7 +221,7 @@ bom { ] } } - library("Couchbase Client", "3.2.3") { + library("Couchbase Client", "3.2.4") { group("com.couchbase.client") { modules = [ "java-client" From 607508945cabad779512e30d617e1c803ca1c4ef Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:10 +0100 Subject: [PATCH 08/40] Upgrade to DB2 JDBC 11.5.7.0 Closes gh-29208 --- 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 6bad5afdda..afd4bcbfd7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -228,7 +228,7 @@ bom { ] } } - library("DB2 JDBC", "11.5.6.0") { + library("DB2 JDBC", "11.5.7.0") { group("com.ibm.db2") { modules = [ "jcc" From a79a497f1330f9ddd9d23663db23563b94dbdb88 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:11 +0100 Subject: [PATCH 09/40] Upgrade to Dropwizard Metrics 4.2.7 Closes gh-29209 --- 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 afd4bcbfd7..1af6ba4a69 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -253,7 +253,7 @@ bom { ] } } - library("Dropwizard Metrics", "4.2.4") { + library("Dropwizard Metrics", "4.2.7") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From f354c4dac4a58d5a66c9cffb8d12a0497dad5538 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:13 +0100 Subject: [PATCH 10/40] Upgrade to Ehcache3 3.9.9 Closes gh-29210 --- 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 1af6ba4a69..7ab5e23c60 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -267,7 +267,7 @@ bom { ] } } - library("Ehcache3", "3.9.7") { + library("Ehcache3", "3.9.9") { group("org.ehcache") { modules = [ "ehcache", From 9e443d772f4fd76baa79dba033b299526e650d79 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:16 +0100 Subject: [PATCH 11/40] Upgrade to Hazelcast 4.2.4 Closes gh-29213 --- 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 7ab5e23c60..2ba9ca6dd3 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -412,7 +412,7 @@ bom { ] } } - library("Hazelcast", "4.2.2") { + library("Hazelcast", "4.2.4") { group("com.hazelcast") { modules = [ "hazelcast", From 464ea36ef57f9d2015bba0776830a2ebcd7286b0 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:17 +0100 Subject: [PATCH 12/40] Upgrade to Hibernate 5.6.3.Final Closes gh-29214 --- 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 2ba9ca6dd3..0420e76396 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -428,7 +428,7 @@ bom { ] } } - library("Hibernate", "5.6.1.Final") { + library("Hibernate", "5.6.3.Final") { prohibit("[6.0.0.Alpha2,)") { because "it uses the jakarta.* namespace" } From 8da7be8e327ed67a5105ea3f71fca1ecc361b58e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:18 +0100 Subject: [PATCH 13/40] Upgrade to HtmlUnit 2.56.0 Closes gh-29215 --- 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 0420e76396..8939f662d4 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -482,7 +482,7 @@ bom { ] } } - library("HtmlUnit", "2.54.0") { + library("HtmlUnit", "2.56.0") { group("net.sourceforge.htmlunit") { modules = [ "htmlunit" { From 5a641fd50e253154af52c496a62598b5d8fbdf0a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:19 +0100 Subject: [PATCH 14/40] Upgrade to HttpAsyncClient 4.1.5 Closes gh-29216 --- 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 8939f662d4..e81b393e44 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -491,7 +491,7 @@ bom { ] } } - library("HttpAsyncClient", "4.1.4") { + library("HttpAsyncClient", "4.1.5") { group("org.apache.httpcomponents") { modules = [ "httpasyncclient" { From 46f17d8a50270962a2b064e32f8328159c7de70e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:21 +0100 Subject: [PATCH 15/40] Upgrade to HttpCore 4.4.15 Closes gh-29217 --- 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 e81b393e44..720a1fcd84 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -524,7 +524,7 @@ bom { ] } } - library("HttpCore", "4.4.14") { + library("HttpCore", "4.4.15") { group("org.apache.httpcomponents") { modules = [ "httpcore", From 18df80df17bddda4567816411e8848e6e86354ef Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:22 +0100 Subject: [PATCH 16/40] Upgrade to HttpCore5 5.1.3 Closes gh-29218 --- 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 720a1fcd84..76f4fa7643 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -532,7 +532,7 @@ bom { ] } } - library("HttpCore5", "5.1.2") { + library("HttpCore5", "5.1.3") { group("org.apache.httpcomponents.core5") { modules = [ "httpcore5", From 23a1dc99388b6600c776d5a73dbcc3102ef467b0 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:23 +0100 Subject: [PATCH 17/40] Upgrade to Jackson Bom 2.13.1 Closes gh-29219 --- 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 76f4fa7643..7d6f4b7801 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -555,7 +555,7 @@ bom { ] } } - library("Jackson Bom", "2.13.0") { + library("Jackson Bom", "2.13.1") { group("com.fasterxml.jackson") { imports = [ "jackson-bom" From de22f4754158df16a3c69deb74c03c1ed43cc8aa Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:24 +0100 Subject: [PATCH 18/40] Upgrade to Jaybird 4.0.5.java8 Closes gh-29220 --- 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 7d6f4b7801..1a8bb1e3d2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -848,7 +848,7 @@ bom { ] } } - library("Jaybird", "4.0.4.java8") { + library("Jaybird", "4.0.5.java8") { group("org.firebirdsql.jdbc") { modules = [ "jaybird", From 78873706cfa72d0c64ed3a8e12a29d875ff3a8b3 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 08:22:25 +0100 Subject: [PATCH 19/40] Upgrade to JDOM2 2.0.6.1 Closes gh-29221 --- 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 1a8bb1e3d2..ff1ffcf183 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -863,7 +863,7 @@ bom { ] } } - library("JDOM2", "2.0.6") { + library("JDOM2", "2.0.6.1") { group("org.jdom") { modules = [ "jdom2" From 179414c7f3f6a9a4afc08519baf86845192a8bbc Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:29 +0100 Subject: [PATCH 20/40] Upgrade to JUnit Jupiter 5.8.2 Closes gh-29227 --- 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 ff1ffcf183..7948db817d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1016,7 +1016,7 @@ bom { ] } } - library("JUnit Jupiter", "5.8.1") { + library("JUnit Jupiter", "5.8.2") { group("org.junit") { imports = [ "junit-bom" From 5a34c9653cda891a25439e1740c743fb8ded4248 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:30 +0100 Subject: [PATCH 21/40] Upgrade to Kotlin 1.6.10 Closes gh-29228 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6b1bb71089..55ebe271cd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.caching=true org.gradle.parallel=true org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 -kotlinVersion=1.6.0 +kotlinVersion=1.6.10 tomcatVersion=9.0.55 kotlin.stdlib.default.dependency=false From 765c81c2f0f71c12e71b4c509343f7e26dda0a8e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:32 +0100 Subject: [PATCH 22/40] Upgrade to Logback 1.2.10 Closes gh-29229 --- 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 7948db817d..0c1d71744a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1086,7 +1086,7 @@ bom { ] } } - library("Logback", "1.2.9") { + library("Logback", "1.2.10") { group("ch.qos.logback") { modules = [ "logback-access", From df1a9b848b1e7b6f9d0dd1b158b05fa3319a5291 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:33 +0100 Subject: [PATCH 23/40] Upgrade to Mockito 4.2.0 Closes gh-29230 --- 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 0c1d71744a..6b8dd10936 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1254,7 +1254,7 @@ bom { ] } } - library("Mockito", "4.0.0") { + library("Mockito", "4.2.0") { group("org.mockito") { modules = [ "mockito-core", From 61a65c0a93513da03bedf5c67829a477669f726d Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:34 +0100 Subject: [PATCH 24/40] Upgrade to MSSQL JDBC 9.4.1.jre8 Closes gh-29231 --- 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 6b8dd10936..05e6c4fffa 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1274,7 +1274,7 @@ bom { ] } } - library("MSSQL JDBC", "9.4.0.jre8") { + library("MSSQL JDBC", "9.4.1.jre8") { group("com.microsoft.sqlserver") { modules = [ "mssql-jdbc" From 2c82b18f3fbae7fcc6d21e7565009c63984d47fd Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:35 +0100 Subject: [PATCH 25/40] Upgrade to Netty 4.1.72.Final Closes gh-29232 --- 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 05e6c4fffa..975953e852 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1304,7 +1304,7 @@ bom { ] } } - library("Netty", "4.1.70.Final") { + library("Netty", "4.1.72.Final") { group("io.netty") { imports = [ "netty-bom" From 86a426035d65e40a038c886c395ea3529053a38f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:36 +0100 Subject: [PATCH 26/40] Upgrade to Oracle Database 21.4.0.0.1 Closes gh-29233 --- 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 975953e852..a5c6aeeff0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1337,7 +1337,7 @@ bom { ] } } - library("Oracle Database", "21.3.0.0") { + library("Oracle Database", "21.4.0.0.1") { group("com.oracle.database.jdbc") { imports = [ "ojdbc-bom" From 2c322b67f13f0c077d14acfdcefdf2b15853105c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:37 +0100 Subject: [PATCH 27/40] Upgrade to Prometheus Client 0.14.1 Closes gh-29234 --- 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 a5c6aeeff0..5f1da42c5f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1361,7 +1361,7 @@ bom { ] } } - library("Prometheus Client", "0.12.0") { + library("Prometheus Client", "0.14.1") { group("io.prometheus") { imports = [ "simpleclient_bom" From ddc7da7766dffcbdd42789d63d44b936c4075358 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:38 +0100 Subject: [PATCH 28/40] Upgrade to Rabbit AMQP Client 5.14.0 Closes gh-29235 --- 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 5f1da42c5f..1a2bce2d5a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1393,7 +1393,7 @@ bom { ] } } - library("Rabbit AMQP Client", "5.13.1") { + library("Rabbit AMQP Client", "5.14.0") { group("com.rabbitmq") { modules = [ "amqp-client" From 017d3dc4029a6bf0711b3d43bad9c517f3031d15 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:40 +0100 Subject: [PATCH 29/40] Upgrade to Reactor Bom 2020.0.14 Closes gh-29236 --- 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 1a2bce2d5a..42df274ee0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1414,7 +1414,7 @@ bom { ] } } - library("Reactor Bom", "2020.0.13") { + library("Reactor Bom", "2020.0.14") { group("io.projectreactor") { imports = [ "reactor-bom" From a2bed160f050c728abfda5b0ad3cce8f43dfc46d Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:41 +0100 Subject: [PATCH 30/40] Upgrade to Selenium 4.1.1 Closes gh-29237 --- .../spring-boot-dependencies/build.gradle | 2 +- .../WebMvcTestWebDriverIntegrationTests.java | 6 +++--- spring-boot-project/spring-boot-test/build.gradle | 1 + .../LocalHostWebConnectionHtmlUnitDriverTests.java | 13 ++++++++----- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 42df274ee0..5dab92b4b7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1549,7 +1549,7 @@ bom { ] } } - library("Selenium", "3.141.59") { + library("Selenium", "4.1.1") { group("org.seleniumhq.selenium") { modules = [ "selenium-api", diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverIntegrationTests.java index 50faf940de..534fdae23a 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.openqa.selenium.By; -import org.openqa.selenium.NoSuchWindowException; +import org.openqa.selenium.NoSuchSessionException; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; @@ -59,7 +59,7 @@ class WebMvcTestWebDriverIntegrationTests { this.webDriver.get("/html"); WebElement element = this.webDriver.findElement(By.tagName("body")); assertThat(element.getText()).isEqualTo("Hello"); - assertThatExceptionOfType(NoSuchWindowException.class).isThrownBy(previousWebDriver::getWindowHandle); + assertThatExceptionOfType(NoSuchSessionException.class).isThrownBy(previousWebDriver::getWindowHandle); assertThat(previousWebDriver).isNotNull().isNotSameAs(this.webDriver); } diff --git a/spring-boot-project/spring-boot-test/build.gradle b/spring-boot-project/spring-boot-test/build.gradle index 8ce8eba2c8..b31a8ec6ce 100644 --- a/spring-boot-project/spring-boot-test/build.gradle +++ b/spring-boot-project/spring-boot-test/build.gradle @@ -45,6 +45,7 @@ dependencies { testImplementation("io.mockk:mockk") testImplementation("jakarta.json:jakarta.json-api") testImplementation("ch.qos.logback:logback-classic") + testImplementation("com.squareup.okhttp3:okhttp") testImplementation("org.apache.tomcat.embed:tomcat-embed-core") testImplementation("org.codehaus.groovy:groovy") testImplementation("org.codehaus.groovy:groovy-xml") diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/htmlunit/webdriver/LocalHostWebConnectionHtmlUnitDriverTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/htmlunit/webdriver/LocalHostWebConnectionHtmlUnitDriverTests.java index 9272668202..2e4b3b3bff 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/htmlunit/webdriver/LocalHostWebConnectionHtmlUnitDriverTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/htmlunit/webdriver/LocalHostWebConnectionHtmlUnitDriverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,8 +35,8 @@ import org.springframework.core.env.Environment; import org.springframework.mock.env.MockEnvironment; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -55,6 +55,9 @@ class LocalHostWebConnectionHtmlUnitDriverTests { this.webClient = webClient; given(this.webClient.getOptions()).willReturn(new WebClientOptions()); given(this.webClient.getWebConsole()).willReturn(new WebConsole()); + WebWindow currentWindow = mock(WebWindow.class); + given(currentWindow.isClosed()).willReturn(false); + given(this.webClient.getCurrentWindow()).willReturn(currentWindow); } @Test @@ -80,7 +83,7 @@ class LocalHostWebConnectionHtmlUnitDriverTests { void createWithCapabilitiesWhenEnvironmentIsNullWillThrowException() { Capabilities capabilities = mock(Capabilities.class); given(capabilities.getBrowserName()).willReturn("htmlunit"); - given(capabilities.getVersion()).willReturn("chrome"); + given(capabilities.getBrowserVersion()).willReturn("chrome"); assertThatIllegalArgumentException() .isThrownBy(() -> new LocalHostWebConnectionHtmlUnitDriver(null, capabilities)) .withMessageContaining("Environment must not be null"); @@ -91,7 +94,7 @@ class LocalHostWebConnectionHtmlUnitDriverTests { MockEnvironment environment = new MockEnvironment(); LocalHostWebConnectionHtmlUnitDriver driver = new TestLocalHostWebConnectionHtmlUnitDriver(environment); driver.get("/test"); - verify(this.webClient).getPage(any(WebWindow.class), requestToUrl(new URL("http://localhost:8080/test"))); + verify(this.webClient).getPage(isNull(), requestToUrl(new URL("http://localhost:8080/test"))); } @Test @@ -100,7 +103,7 @@ class LocalHostWebConnectionHtmlUnitDriverTests { environment.setProperty("local.server.port", "8181"); LocalHostWebConnectionHtmlUnitDriver driver = new TestLocalHostWebConnectionHtmlUnitDriver(environment); driver.get("/test"); - verify(this.webClient).getPage(any(WebWindow.class), requestToUrl(new URL("http://localhost:8181/test"))); + verify(this.webClient).getPage(isNull(), requestToUrl(new URL("http://localhost:8181/test"))); } private WebRequest requestToUrl(URL url) { From 7a016a68f138c62cd3b5d366c026f6c8489273db Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:42 +0100 Subject: [PATCH 31/40] Upgrade to Selenium HtmlUnit 3.56.0 Closes gh-29238 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- spring-boot-project/spring-boot-test/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 5dab92b4b7..6f1a75099a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1565,7 +1565,7 @@ bom { ] } } - library("Selenium HtmlUnit", "2.54.0") { + library("Selenium HtmlUnit", "3.56.0") { group("org.seleniumhq.selenium") { modules = [ "htmlunit-driver" diff --git a/spring-boot-project/spring-boot-test/build.gradle b/spring-boot-project/spring-boot-test/build.gradle index b31a8ec6ce..c1ba5954a0 100644 --- a/spring-boot-project/spring-boot-test/build.gradle +++ b/spring-boot-project/spring-boot-test/build.gradle @@ -45,7 +45,7 @@ dependencies { testImplementation("io.mockk:mockk") testImplementation("jakarta.json:jakarta.json-api") testImplementation("ch.qos.logback:logback-classic") - testImplementation("com.squareup.okhttp3:okhttp") + testImplementation("com.squareup.okhttp3:okhttp") testImplementation("org.apache.tomcat.embed:tomcat-embed-core") testImplementation("org.codehaus.groovy:groovy") testImplementation("org.codehaus.groovy:groovy-xml") From b76691a4b08012c44fa1c4b0eb2f12d2b5d2953c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:43 +0100 Subject: [PATCH 32/40] Upgrade to SendGrid 4.8.1 Closes gh-29239 --- 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 6f1a75099a..59e54e02ef 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1572,7 +1572,7 @@ bom { ] } } - library("SendGrid", "4.7.6") { + library("SendGrid", "4.8.1") { group("com.sendgrid") { modules = [ "sendgrid-java" From ec0dd5bf3352824cd51843fc539a30efaa792373 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:44 +0100 Subject: [PATCH 33/40] Upgrade to SnakeYAML 1.30 Closes gh-29240 --- 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 59e54e02ef..b0db8007c6 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1602,7 +1602,7 @@ bom { ] } } - library("SnakeYAML", "1.29") { + library("SnakeYAML", "1.30") { group("org.yaml") { modules = [ "snakeyaml" From 78909199585b35b958a363aff964d74dcbf3ae05 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:45 +0100 Subject: [PATCH 34/40] Upgrade to Spring AMQP 2.4.1 Closes gh-29241 --- 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 b0db8007c6..0015591a84 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1631,7 +1631,7 @@ bom { ] } } - library("Spring AMQP", "2.4.0") { + library("Spring AMQP", "2.4.1") { group("org.springframework.amqp") { modules = [ "spring-amqp", From 0106e35b6139ecd65bb5c4e836d77fa6dca89968 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:46 +0100 Subject: [PATCH 35/40] Upgrade to Spring Integration 5.5.7 Closes gh-29242 --- 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 0015591a84..02e257bdc9 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1681,7 +1681,7 @@ bom { ] } } - library("Spring Integration", "5.5.6") { + library("Spring Integration", "5.5.7") { group("org.springframework.integration") { imports = [ "spring-integration-bom" From 0d8fc234b520df3bc8e1d93d4e1fbe9ee20623d9 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:48 +0100 Subject: [PATCH 36/40] Upgrade to Spring WS 3.1.2 Closes gh-29243 --- 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 02e257bdc9..356f923886 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1740,7 +1740,7 @@ bom { ] } } - library("Spring WS", "3.1.1") { + library("Spring WS", "3.1.2") { group("org.springframework.ws") { modules = [ "spring-ws-core", From 714c1cc64298802adc10a58faf21d3cc0e2fea56 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:49 +0100 Subject: [PATCH 37/40] Upgrade to Thymeleaf 3.0.14.RELEASE Closes gh-29244 --- 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 356f923886..59e29bfb94 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1768,7 +1768,7 @@ bom { ] } } - library("Thymeleaf", "3.0.12.RELEASE") { + library("Thymeleaf", "3.0.14.RELEASE") { group("org.thymeleaf") { modules = [ "thymeleaf", From 43e7c3b695c55591da6d1950791d963b7533f25c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:50 +0100 Subject: [PATCH 38/40] Upgrade to Tomcat 9.0.56 Closes gh-29245 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 55ebe271cd..344d49cd04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,6 +5,6 @@ org.gradle.parallel=true org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.6.10 -tomcatVersion=9.0.55 +tomcatVersion=9.0.56 kotlin.stdlib.default.dependency=false From 67f8b0484d0b970e3bb049364906f8aae74e99ec Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:42:51 +0100 Subject: [PATCH 39/40] Upgrade to Undertow 2.2.14.Final Closes gh-29246 --- 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 59e29bfb94..d6af4d708f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1831,7 +1831,7 @@ bom { ] } } - library("Undertow", "2.2.12.Final") { + library("Undertow", "2.2.14.Final") { group("io.undertow") { modules = [ "undertow-core", From cd0bb8e68f12d5a11b97f1e648c3721ebd1cda46 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 3 Jan 2022 09:58:25 +0100 Subject: [PATCH 40/40] Upgrade to XmlUnit2 2.8.4 Closes gh-29247 --- 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 d6af4d708f..2159ab2eee 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1868,7 +1868,7 @@ bom { ] } } - library("XmlUnit2", "2.8.3") { + library("XmlUnit2", "2.8.4") { group("org.xmlunit") { modules = [ "xmlunit-assertj",