From 8732ac708da47c3735929dad483da0cfa6a3d6b6 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:18 +0100 Subject: [PATCH 01/31] Upgrade to Awaitility 4.2.0 Closes gh-30284 --- 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 4e233ea845..aa5227a55e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -130,7 +130,7 @@ bom { ] } } - library("Awaitility", "4.1.1") { + library("Awaitility", "4.2.0") { group("org.awaitility") { modules = [ "awaitility", From 5b44ad15f757d055a47b76d3a9637fecf005bc70 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:20 +0100 Subject: [PATCH 02/31] Upgrade to Cassandra Driver 4.14.0 Closes gh-30285 --- 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 aa5227a55e..93cdf35fb0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -168,7 +168,7 @@ bom { ] } } - library("Cassandra Driver", "4.13.0") { + library("Cassandra Driver", "4.14.0") { group("com.datastax.oss") { imports = [ "java-driver-bom" From 046afae1aa48d1a3c4af0862e697649b9479f347 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:22 +0100 Subject: [PATCH 03/31] Upgrade to Couchbase Client 3.2.6 Closes gh-30286 --- 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 93cdf35fb0..759e0850e2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -224,7 +224,7 @@ bom { ] } } - library("Couchbase Client", "3.2.5") { + library("Couchbase Client", "3.2.6") { group("com.couchbase.client") { modules = [ "java-client" From d521a7bb1baaad623f5d223a1065344a7a08e6b8 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:24 +0100 Subject: [PATCH 04/31] Upgrade to Dropwizard Metrics 4.2.9 Closes gh-30287 --- 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 759e0850e2..eb6ca33314 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -256,7 +256,7 @@ bom { ] } } - library("Dropwizard Metrics", "4.2.8") { + library("Dropwizard Metrics", "4.2.9") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From bf477700f6bd8bb3284d9ac10b33efd8b2bd62bf Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:26 +0100 Subject: [PATCH 05/31] Upgrade to Ehcache3 3.10.0 Closes gh-30288 --- 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 eb6ca33314..9d2e3f40b7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -270,7 +270,7 @@ bom { ] } } - library("Ehcache3", "3.9.9") { + library("Ehcache3", "3.10.0") { group("org.ehcache") { modules = [ "ehcache", From 41150f1ef45849b695f8cdac401aaeb23c3eed02 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:28 +0100 Subject: [PATCH 06/31] Upgrade to Elasticsearch 7.17.1 Closes gh-30289 --- 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 9d2e3f40b7..0d07249427 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -279,7 +279,7 @@ bom { ] } } - library("Elasticsearch", "7.17.0") { + library("Elasticsearch", "7.17.1") { group("org.elasticsearch") { modules = [ "elasticsearch" From ca89dd58f41dd8be1d12d1f2b741ba7ad12a17ae Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:31 +0100 Subject: [PATCH 07/31] Upgrade to Flyway 8.5.4 Closes gh-30290 --- 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 0d07249427..93e58ba97e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -317,7 +317,7 @@ bom { ] } } - library("Flyway", "8.5.1") { + library("Flyway", "8.5.4") { group("org.flywaydb") { modules = [ "flyway-core", From 1c11ae8a7d9cacf711de38aa9853089bcff34103 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:33 +0100 Subject: [PATCH 08/31] Upgrade to Groovy 3.0.10 Closes gh-30291 --- 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 93e58ba97e..5a129af754 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -388,7 +388,7 @@ bom { ] } } - library("Groovy", "3.0.9") { + library("Groovy", "3.0.10") { group("org.codehaus.groovy") { imports = [ "groovy-bom" From 00cba283903a747cd3319a9283f765f2d7e6a6d9 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:36 +0100 Subject: [PATCH 09/31] Upgrade to Hazelcast 5.1.1 Closes gh-30292 --- 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 5a129af754..2826619a9f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -418,7 +418,7 @@ bom { ] } } - library("Hazelcast", "5.1") { + library("Hazelcast", "5.1.1") { group("com.hazelcast") { modules = [ "hazelcast", From 30757941752d902fe6e74be6354437aefccf9129 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:39 +0100 Subject: [PATCH 10/31] Upgrade to Hibernate 5.6.7.Final Closes gh-30293 --- 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 2826619a9f..ff8f0a863d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -434,7 +434,7 @@ bom { ] } } - library("Hibernate", "5.6.5.Final") { + library("Hibernate", "5.6.7.Final") { prohibit("[6.0.0.Alpha2,)") { because "it uses the jakarta.* namespace" } From d40465260da1ee5dbcf15954b21e5c905fa33a08 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:42 +0100 Subject: [PATCH 11/31] Upgrade to Hibernate Validator 6.2.3.Final Closes gh-30294 --- 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 ff8f0a863d..ebd762e985 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -457,7 +457,7 @@ bom { ] } } - library("Hibernate Validator", "6.2.2.Final") { + library("Hibernate Validator", "6.2.3.Final") { prohibit("[7.0.0.Alpha1,)") { because "it uses the jakarta.* namespace" } From fa6bcd5d6cc01c6981782933de9e9ef501f11e90 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:46 +0100 Subject: [PATCH 12/31] Upgrade to HtmlUnit 2.59.0 Closes gh-30295 --- 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 ebd762e985..ac1706adbe 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -488,7 +488,7 @@ bom { ] } } - library("HtmlUnit", "2.58.0") { + library("HtmlUnit", "2.59.0") { group("net.sourceforge.htmlunit") { modules = [ "htmlunit" { From 20dd6463a3c8834ea9f102311dfcacd382d5200f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:48 +0100 Subject: [PATCH 13/31] Upgrade to Infinispan 13.0.8.Final Closes gh-30296 --- 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 ac1706adbe..6f218642ad 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -547,7 +547,7 @@ bom { ] } } - library("Infinispan", "13.0.6.Final") { + library("Infinispan", "13.0.8.Final") { group("org.infinispan") { imports = [ "infinispan-bom" From aa39c5a012f8a3522381b8bb9d02e84c1e3ed590 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:50 +0100 Subject: [PATCH 14/31] Upgrade to Jackson Bom 2.13.2 Closes gh-30297 --- 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 6f218642ad..438e317cc0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -561,7 +561,7 @@ bom { ] } } - library("Jackson Bom", "2.13.1") { + library("Jackson Bom", "2.13.2") { group("com.fasterxml.jackson") { imports = [ "jackson-bom" From 154195d9a24c4b6c0dccdcee71f4e0147ed1b824 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:53 +0100 Subject: [PATCH 15/31] Upgrade to Liquibase 4.9.0 Closes gh-30298 --- 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 438e317cc0..a01c030acf 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1094,7 +1094,7 @@ bom { ] } } - library("Liquibase", "4.8.0") { + library("Liquibase", "4.9.0") { group("org.liquibase") { modules = [ "liquibase-cdi", From f8a6efb15e05876c1474e79a2a2b5be0ae437b0e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:55 +0100 Subject: [PATCH 16/31] Upgrade to Log4j2 2.17.2 Closes gh-30299 --- 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 a01c030acf..8ff1b79f17 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1105,7 +1105,7 @@ bom { ] } } - library("Log4j2", "2.17.1") { + library("Log4j2", "2.17.2") { group("org.apache.logging.log4j") { imports = [ "log4j-bom" From 0b20b99f6e3f1887193867022459d124a047a25c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:57 +0100 Subject: [PATCH 17/31] Upgrade to Maven Compiler Plugin 3.10.1 Closes gh-30300 --- 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 8ff1b79f17..01f780a871 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1156,7 +1156,7 @@ bom { ] } } - library("Maven Compiler Plugin", "3.10.0") { + library("Maven Compiler Plugin", "3.10.1") { group("org.apache.maven.plugins") { plugins = [ "maven-compiler-plugin" From 717f8739c551d1ef8b169dc377584a70be507e5c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:17:59 +0100 Subject: [PATCH 18/31] Upgrade to Maven Dependency Plugin 3.3.0 Closes gh-30301 --- 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 01f780a871..6561f9b1a5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1163,7 +1163,7 @@ bom { ] } } - library("Maven Dependency Plugin", "3.2.0") { + library("Maven Dependency Plugin", "3.3.0") { group("org.apache.maven.plugins") { plugins = [ "maven-dependency-plugin" From d8c231a1d113fcfca0829ebc44028edb1b235aa1 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:18:01 +0100 Subject: [PATCH 19/31] Upgrade to Mockito 4.4.0 Closes gh-30302 --- 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 6561f9b1a5..c43eac1da9 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1280,7 +1280,7 @@ bom { ] } } - library("Mockito", "4.3.1") { + library("Mockito", "4.4.0") { group("org.mockito") { modules = [ "mockito-core", From b0f6166e5e471594f360a24a4c2d515e81c24e11 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:26:04 +0100 Subject: [PATCH 20/31] Upgrade to Logback 1.2.11 Closes gh-30305 --- 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 c43eac1da9..e6aa188c53 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1112,7 +1112,7 @@ bom { ] } } - library("Logback", "1.2.10") { + library("Logback", "1.2.11") { group("ch.qos.logback") { modules = [ "logback-access", From f129a733a417dabcf8d3b3b2324e5940e50f392a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:26:06 +0100 Subject: [PATCH 21/31] Upgrade to Netty 4.1.75.Final Closes gh-30306 --- 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 e6aa188c53..0d894f5102 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1330,7 +1330,7 @@ bom { ] } } - library("Netty", "4.1.74.Final") { + library("Netty", "4.1.75.Final") { group("io.netty") { imports = [ "netty-bom" From 8b27263eee516820bd8f78d40b3fb43fb393c764 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:26:08 +0100 Subject: [PATCH 22/31] Upgrade to R2DBC Bom Borca-SR1 Closes gh-30307 --- 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 0d894f5102..b48d12508c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1401,7 +1401,7 @@ bom { ] } } - library("R2DBC Bom", "Borca-RELEASE") { + library("R2DBC Bom", "Borca-SR1") { group("io.r2dbc") { imports = [ "r2dbc-bom" From 6487b809fe9e6d18ae7494c2b49bf9a66bd1fba4 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:26:11 +0100 Subject: [PATCH 23/31] Upgrade to Rabbit Stream Client 0.5.0 Closes gh-30308 --- 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 b48d12508c..12dd266b5b 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1415,7 +1415,7 @@ bom { ] } } - library("Rabbit Stream Client", "0.4.0") { + library("Rabbit Stream Client", "0.5.0") { group("com.rabbitmq") { modules = [ "stream-client" From c70be97fc4630adee55b8d8f5114f07684261a87 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:26:13 +0100 Subject: [PATCH 24/31] Upgrade to Selenium HtmlUnit 3.59.0 Closes gh-30309 --- 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 12dd266b5b..7f9a95fad5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1580,7 +1580,7 @@ bom { ] } } - library("Selenium HtmlUnit", "3.58.0") { + library("Selenium HtmlUnit", "3.59.0") { group("org.seleniumhq.selenium") { modules = [ "htmlunit-driver" From 0946f28dcd62f447d86f7f1b334c18719c3ad2a7 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:26:15 +0100 Subject: [PATCH 25/31] Upgrade to SendGrid 4.9.0 Closes gh-30310 --- 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 7f9a95fad5..50db1c3391 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1587,7 +1587,7 @@ bom { ] } } - library("SendGrid", "4.8.3") { + library("SendGrid", "4.9.0") { group("com.sendgrid") { modules = [ "sendgrid-java" From 426f239d2ce12d3e8c8cd95dc5460da4939225c2 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:26:17 +0100 Subject: [PATCH 26/31] Upgrade to Spring Retry 1.3.2 Closes gh-30311 --- 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 50db1c3391..964c46b51d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1735,7 +1735,7 @@ bom { ] } } - library("Spring Retry", "1.3.1") { + library("Spring Retry", "1.3.2") { group("org.springframework.retry") { modules = [ "spring-retry" From 3d011fc2e6024aa9528a5dc863d21efd220a9291 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:26:22 +0100 Subject: [PATCH 27/31] Upgrade to Tomcat 9.0.60 Closes gh-30313 --- gradle.properties | 2 +- .../springframework/boot/web/embedded/tomcat/TldPatterns.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index b74c2dd1ec..101e377876 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.58 +tomcatVersion=9.0.60 kotlin.stdlib.default.dependency=false diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java index 0b8b07b564..fd1b8f4f60 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 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. @@ -68,6 +68,7 @@ final class TldPatterns { skipPatterns.add("el-api.jar"); skipPatterns.add("geronimo-spec-jaxrpc*.jar"); skipPatterns.add("h2*.jar"); + skipPatterns.add("ha-api-*.jar"); skipPatterns.add("hamcrest-*.jar"); skipPatterns.add("hibernate*.jar"); skipPatterns.add("httpclient*.jar"); @@ -77,6 +78,7 @@ final class TldPatterns { skipPatterns.add("jaspic-api.jar"); skipPatterns.add("jaxb-*.jar"); skipPatterns.add("jaxen-*.jar"); + skipPatterns.add("jaxws-rt-*.jar"); skipPatterns.add("jdom-*.jar"); skipPatterns.add("jetty-*.jar"); skipPatterns.add("jmx-tools.jar"); From e79073bee3e5844b9b412d62e40b2210de1b12c8 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:26:25 +0100 Subject: [PATCH 28/31] Upgrade to UnboundID LDAPSDK 6.0.4 Closes gh-30314 --- 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 964c46b51d..baf284fe12 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1840,7 +1840,7 @@ bom { ] } } - library("UnboundID LDAPSDK", "6.0.3") { + library("UnboundID LDAPSDK", "6.0.4") { group("com.unboundid") { modules = [ "unboundid-ldapsdk" From 1e55ef2f973123e2f48fd855180a9775a9e4f543 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 09:26:27 +0100 Subject: [PATCH 29/31] Upgrade to Versions Maven Plugin 2.10.0 Closes gh-30315 --- 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 baf284fe12..541286dacd 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1856,7 +1856,7 @@ bom { ] } } - library("Versions Maven Plugin", "2.9.0") { + library("Versions Maven Plugin", "2.10.0") { group("org.codehaus.mojo") { plugins = [ "versions-maven-plugin" From 2fbb36bd0434f28636b47891eb3db52306afc707 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 10:17:23 +0100 Subject: [PATCH 30/31] fixup! Upgrade to Flyway 8.5.4 --- .../flyway/FlywayAutoConfiguration.java | 3 +++ .../boot/autoconfigure/flyway/FlywayProperties.java | 13 +++++++++++++ .../additional-spring-configuration-metadata.json | 4 ++++ 3 files changed, 20 insertions(+) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java index 77f41f55a0..711a12bce7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java @@ -188,6 +188,9 @@ public class FlywayAutoConfiguration { map.from(properties.getPlaceholders()).to(configuration::placeholders); map.from(properties.getPlaceholderPrefix()).to(configuration::placeholderPrefix); map.from(properties.getPlaceholderSuffix()).to(configuration::placeholderSuffix); + // No method reference for compatibility with Flyway version < 8.0 + map.from(properties.getPlaceholderSeparator()) + .to((placeHolderSeparator) -> configuration.placeholderSeparator(placeHolderSeparator)); map.from(properties.isPlaceholderReplacement()).to(configuration::placeholderReplacement); map.from(properties.getSqlMigrationPrefix()).to(configuration::sqlMigrationPrefix); map.from(properties.getSqlMigrationSuffixes()).as(StringUtils::toStringArray) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java index 075b21fbb8..9829b53042 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java @@ -146,6 +146,11 @@ public class FlywayProperties { */ private String placeholderSuffix = "}"; + /** + * Separator of default placeholders. + */ + private String placeholderSeparator; + /** * Perform placeholder replacement in migration scripts. */ @@ -538,6 +543,14 @@ public class FlywayProperties { this.placeholderSuffix = placeholderSuffix; } + public String getPlaceholderSeparator() { + return this.placeholderSeparator; + } + + public void setPlaceholderSeparator(String placeholderSeparator) { + this.placeholderSeparator = placeholderSeparator; + } + public boolean isPlaceholderReplacement() { return this.placeholderReplacement; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index c6583d470c..367b06ba72 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -923,6 +923,10 @@ "name": "spring.flyway.lock-retry-count", "defaultValue": 50 }, + { + "name": "spring.flyway.placeholder-separator", + "defaultValue": ":" + }, { "name": "spring.flyway.script-placeholder-prefix", "defaultValue": "FP__" From 2ab0ce3ea7186e5ba8da1850a3961bac447eb878 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 14:52:46 +0100 Subject: [PATCH 31/31] Upgrade to Neo4j Java Driver 4.4.5 Closes gh-30303 --- .../boot/autoconfigure/neo4j/Neo4jAutoConfigurationTests.java | 4 ++-- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationTests.java index 3c892cc488..6903ff4ca1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 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. @@ -292,7 +292,7 @@ class Neo4jAutoConfigurationTests { Config.TrustStrategy trustStrategy = mapDriverConfig(properties).trustStrategy(); assertThat(trustStrategy.strategy()) .isEqualTo(Config.TrustStrategy.Strategy.TRUST_CUSTOM_CA_SIGNED_CERTIFICATES); - assertThat(trustStrategy.certFile()).isEqualTo(certFile); + assertThat(trustStrategy.certFiles()).containsOnly(certFile); } @Test diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 541286dacd..f02d511348 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1323,7 +1323,7 @@ bom { ] } } - library("Neo4j Java Driver", "4.4.3") { + library("Neo4j Java Driver", "4.4.5") { group("org.neo4j.driver") { modules = [ "neo4j-java-driver"