From 8be87b19cf2e223c5d9b17eb53bf557eb5f2fe14 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 13:56:47 +0100 Subject: [PATCH 01/12] Upgrade to Couchbase Client 3.2.6 Closes gh-30237 --- 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 b2f147ad3e..3054e9ba59 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.5") { + library("Couchbase Client", "3.2.6") { group("com.couchbase.client") { modules = [ "java-client" From 9a1f60131e0d4f4d2a2ec716920dd3218258c946 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 13:56:50 +0100 Subject: [PATCH 02/12] Upgrade to Dropwizard Metrics 4.2.9 Closes gh-30238 --- 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 3054e9ba59..dc4fdf65f0 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.8") { + library("Dropwizard Metrics", "4.2.9") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From 8e016e8922a76f856223f12556b589c128da3fc4 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 13:56:52 +0100 Subject: [PATCH 03/12] Upgrade to Groovy 3.0.10 Closes gh-30239 --- 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 dc4fdf65f0..c45a8693e9 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -375,7 +375,7 @@ bom { ] } } - library("Groovy", "3.0.9") { + library("Groovy", "3.0.10") { group("org.codehaus.groovy") { imports = [ "groovy-bom" From 230ebcbe8891c1d8dddd24578fba54cf797d5384 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 13:56:55 +0100 Subject: [PATCH 04/12] Upgrade to Hibernate 5.6.6.Final Closes gh-30240 --- 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 c45a8693e9..8b19fef8df 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -421,7 +421,7 @@ bom { ] } } - library("Hibernate", "5.6.5.Final") { + library("Hibernate", "5.6.6.Final") { prohibit("[6.0.0.Alpha2,)") { because "it uses the jakarta.* namespace" } From 1385c6af90cc4b78020fc1eaeaa4653f77aa7354 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 13:56:57 +0100 Subject: [PATCH 05/12] Upgrade to Hibernate Validator 6.2.3.Final Closes gh-30241 --- 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 8b19fef8df..945fa7c814 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -444,7 +444,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 57d3a52301210a34c64874333a63cbf56e5d37b7 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 13:57:02 +0100 Subject: [PATCH 06/12] Upgrade to Kafka 3.0.1 Closes gh-30243 --- 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 945fa7c814..cec947b514 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("Kafka", "3.0.0") { + library("Kafka", "3.0.1") { group("org.apache.kafka") { modules = [ "connect", From 8deab79cacfab82d8b6aebd65f6d09332089cbfd Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 13:57:04 +0100 Subject: [PATCH 07/12] Upgrade to Log4j2 2.17.2 Closes gh-30244 --- 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 cec947b514..ec376035d5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1092,7 +1092,7 @@ bom { ] } } - library("Log4j2", "2.17.1") { + library("Log4j2", "2.17.2") { group("org.apache.logging.log4j") { imports = [ "log4j-bom" From 7cf5dcd3f942d8dccf00cf8411c1f4fbba7e4ac7 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 13:57:06 +0100 Subject: [PATCH 08/12] Upgrade to Logback 1.2.11 Closes gh-30245 --- 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 ec376035d5..1772370113 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1099,7 +1099,7 @@ bom { ] } } - library("Logback", "1.2.10") { + library("Logback", "1.2.11") { group("ch.qos.logback") { modules = [ "logback-access", From 28c8f16b78a1bd23be1f8e39f1ae8929ebd9db2e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 13:57:09 +0100 Subject: [PATCH 09/12] Upgrade to Netty 4.1.75.Final Closes gh-30246 --- 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 1772370113..3edea377fb 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1317,7 +1317,7 @@ bom { ] } } - library("Netty", "4.1.74.Final") { + library("Netty", "4.1.75.Final") { group("io.netty") { imports = [ "netty-bom" From 82f4092cd44a9b89738af4c0a8336460fbc3ac5c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 13:57:11 +0100 Subject: [PATCH 10/12] Upgrade to Netty tcNative 2.0.51.Final Closes gh-30247 --- 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 3edea377fb..e3fc3738fe 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1324,7 +1324,7 @@ bom { ] } } - library("Netty tcNative", "2.0.50.Final") { + library("Netty tcNative", "2.0.51.Final") { group("io.netty") { modules = [ "netty-tcnative", From 82bc28d530790aec333ee12fa8efbea8dde5bb19 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 13:57:13 +0100 Subject: [PATCH 11/12] Upgrade to Spring Retry 1.3.2 Closes gh-30248 --- 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 e3fc3738fe..62c3de7be0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1751,7 +1751,7 @@ bom { ] } } - library("Spring Retry", "1.3.1") { + library("Spring Retry", "1.3.2") { group("org.springframework.retry") { modules = [ "spring-retry" From 9ccbfe52f86a0fb56261d409cc642b7733bc4c18 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Mar 2022 13:57:16 +0100 Subject: [PATCH 12/12] Upgrade to Tomcat 9.0.60 Closes gh-30249 --- 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 fbe653ae0e..d42bcbe13f 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");