From 4d4d5348ab2b48712bad933a60bcb9c7de4dc2eb Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 08:27:47 +0100 Subject: [PATCH 01/10] Upgrade to Couchbase Client 3.1.8 Closes gh-30221 --- 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 baf17987ef7..cb1ef9013fd 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -218,7 +218,7 @@ bom { ] } } - library("Couchbase Client", "3.1.7") { + library("Couchbase Client", "3.1.8") { group("com.couchbase.client") { modules = [ "java-client" From 9bf18ead238890d1853a9ffe5c4b860314643f84 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 08:27:50 +0100 Subject: [PATCH 02/10] Upgrade to Dropwizard Metrics 4.1.31 Closes gh-30222 --- 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 cb1ef9013fd..870206a04ad 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -250,7 +250,7 @@ bom { ] } } - library("Dropwizard Metrics", "4.1.30") { + library("Dropwizard Metrics", "4.1.31") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From 17e07c22caa84e209848274d2cb25cf345ca23aa Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 08:27:52 +0100 Subject: [PATCH 03/10] Upgrade to Groovy 3.0.10 Closes gh-30223 --- 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 870206a04ad..f996ffe578c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -369,7 +369,7 @@ bom { ] } } - library("Groovy", "3.0.9") { + library("Groovy", "3.0.10") { group("org.codehaus.groovy") { imports = [ "groovy-bom" From 0229706440fc6d124bc0c940096f9f011f5c3c48 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 08:27:54 +0100 Subject: [PATCH 04/10] Upgrade to Hibernate Validator 6.2.3.Final Closes gh-30224 --- 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 f996ffe578c..650cfc0afa0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -438,7 +438,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 5c7a43e9d3a12d45fd4846070559e5a4fdc9f126 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 08:27:56 +0100 Subject: [PATCH 05/10] Upgrade to Log4j2 2.17.2 Closes gh-30225 --- 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 650cfc0afa0..1997794516e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1075,7 +1075,7 @@ bom { ] } } - library("Log4j2", "2.17.1") { + library("Log4j2", "2.17.2") { group("org.apache.logging.log4j") { imports = [ "log4j-bom" From a98f7f273c028c30f49c6c22072d115196b68812 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 08:27:59 +0100 Subject: [PATCH 06/10] Upgrade to Logback 1.2.11 Closes gh-30226 --- 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 1997794516e..aadf1523433 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1082,7 +1082,7 @@ bom { ] } } - library("Logback", "1.2.10") { + library("Logback", "1.2.11") { group("ch.qos.logback") { modules = [ "logback-access", From fc72be112cc7d846aac7f5fdf88d71326e2fa938 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 08:28:01 +0100 Subject: [PATCH 07/10] Upgrade to Netty 4.1.75.Final Closes gh-30227 --- 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 aadf1523433..52df4987977 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1300,7 +1300,7 @@ bom { ] } } - library("Netty", "4.1.74.Final") { + library("Netty", "4.1.75.Final") { group("io.netty") { imports = [ "netty-bom" From 58e0665ac88595e8ea67d70dbbe05a976eb97232 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 08:28:03 +0100 Subject: [PATCH 08/10] Upgrade to Netty tcNative 2.0.51.Final Closes gh-30228 --- 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 52df4987977..6fda854fcc2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1307,7 +1307,7 @@ bom { ] } } - library("Netty tcNative", "2.0.50.Final") { + library("Netty tcNative", "2.0.51.Final") { group("io.netty") { modules = [ "netty-tcnative", From 417a6792a07819e80da1222b42a09feb4988bf8c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 08:28:05 +0100 Subject: [PATCH 09/10] Upgrade to Spring Retry 1.3.2 Closes gh-30229 --- 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 6fda854fcc2..bdfd9d2cd26 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1767,7 +1767,7 @@ bom { ] } } - library("Spring Retry", "1.3.1") { + library("Spring Retry", "1.3.2") { group("org.springframework.retry") { modules = [ "spring-retry" From 59f4004fa6ec52f5b6ae54811e533e8870fe31d8 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 08:28:07 +0100 Subject: [PATCH 10/10] Upgrade to Tomcat 9.0.60 Closes gh-30230 --- 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 637e1e26160..c6373c64783 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.5.32 -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 0b8b07b5642..fd1b8f4f60c 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");