From 81aec09357410301916f3a1156eac2fa47613ef5 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 09:01:01 +0100 Subject: [PATCH 01/36] Upgrade to AppEngine SDK 1.9.94 Closes gh-29767 --- 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 718978aa93..7d3e35d80c 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.93") { + library("AppEngine SDK", "1.9.94") { group("com.google.appengine") { modules = [ "appengine-api-1.0-sdk" From 6c09d4d7a151c7ae0dd82448d6cfae007811decd Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 09:01:03 +0100 Subject: [PATCH 02/36] Upgrade to Dropwizard Metrics 4.1.30 Closes gh-29768 --- 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 7d3e35d80c..928d9bd3bd 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -247,7 +247,7 @@ bom { ] } } - library("Dropwizard Metrics", "4.1.29") { + library("Dropwizard Metrics", "4.1.30") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From 2485c05a50a190ebffec652b1eb64bc7f69b564c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 09:01:04 +0100 Subject: [PATCH 03/36] Upgrade to Glassfish JAXB 2.3.6 Closes gh-29769 --- 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 928d9bd3bd..44f1503714 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -342,7 +342,7 @@ bom { ] } } - library("Glassfish JAXB", "2.3.5") { + library("Glassfish JAXB", "2.3.6") { prohibit("[3.0.0-M1,)") { because "it uses the jakarta.* namespace" } From 1cdb75f7805eab38c80a87e6b6479b4657885194 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 09:01:05 +0100 Subject: [PATCH 04/36] Upgrade to Hibernate Validator 6.2.2.Final Closes gh-29770 --- 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 44f1503714..4307975740 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -435,7 +435,7 @@ bom { ] } } - library("Hibernate Validator", "6.2.0.Final") { + library("Hibernate Validator", "6.2.2.Final") { prohibit("[7.0.0.Alpha1,)") { because "it uses the jakarta.* namespace" } From a99582a3bb9073cd15d22fcbcfabca56ba28ea80 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 09:01:06 +0100 Subject: [PATCH 05/36] Upgrade to Jetty 9.4.45.v20220203 Closes gh-29771 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../smoketest/jetty/jsp/SampleWebJspApplicationTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 4307975740..0c28371393 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -899,7 +899,7 @@ bom { ] } } - library("Jetty", "9.4.44.v20210927") { + library("Jetty", "9.4.45.v20220203") { prohibit("[11.0.0-alpha0,)") { because "it uses the jakarta.* namespace" } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java index 22dd4b5882..359b8ec26c 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 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. @@ -59,7 +59,7 @@ class SampleWebJspApplicationTests { JettyServerCustomizer jettyServerCustomizer() { return (server) -> { ContextHandler handler = (ContextHandler) server.getHandler(); - handler.addAliasCheck(new ContextHandler.ApproveAliases()); + handler.addAliasCheck((path, resource) -> true); }; } From 7de763f2d7cff9ea91fb3a266d9d4604461f96d9 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 09:01:07 +0100 Subject: [PATCH 06/36] Upgrade to Johnzon 1.2.16 Closes gh-29772 --- 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 0c28371393..d94358a2b8 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -916,7 +916,7 @@ bom { ] } } - library("Johnzon", "1.2.15") { + library("Johnzon", "1.2.16") { group("org.apache.johnzon") { modules = [ "johnzon-core", From 4f98bfd39d0246d54db39d52080d7fee5a14ce8c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 09:01:09 +0100 Subject: [PATCH 07/36] Upgrade to Json-smart 2.4.8 Closes gh-29773 --- 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 d94358a2b8..fbbca2d737 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -960,7 +960,7 @@ bom { ] } } - library("Json-smart", "2.4.7") { + library("Json-smart", "2.4.8") { group("net.minidev") { modules = [ "json-smart" From f29152496a53bd8a4263d59882f350a2726173ac Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 09:01:10 +0100 Subject: [PATCH 08/36] Upgrade to Neo4j Java Driver 4.2.9 Closes gh-29774 --- 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 fbbca2d737..0789e8167c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1276,7 +1276,7 @@ bom { ] } } - library("Neo4j Java Driver", "4.2.8") { + library("Neo4j Java Driver", "4.2.9") { group("org.neo4j.driver") { modules = [ "neo4j-java-driver" From 66cc3e7730d8017195a604c4b4f9434c03cf191f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 09:01:11 +0100 Subject: [PATCH 09/36] Upgrade to Netty 4.1.74.Final Closes gh-29775 --- 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 0789e8167c..78152e9737 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1283,7 +1283,7 @@ bom { ] } } - library("Netty", "4.1.73.Final") { + library("Netty", "4.1.74.Final") { group("io.netty") { imports = [ "netty-bom" From 1c1bf932b2ca3e5480423ac3d2087225f1a61427 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 09:01:12 +0100 Subject: [PATCH 10/36] Upgrade to Netty tcNative 2.0.48.Final Closes gh-29776 --- 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 78152e9737..fe7b34237d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1290,7 +1290,7 @@ bom { ] } } - library("Netty tcNative", "2.0.47.Final") { + library("Netty tcNative", "2.0.48.Final") { group("io.netty") { modules = [ "netty-tcnative", From ea609ae6972ec277f19add6da3ea42c4446b0575 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 09:01:14 +0100 Subject: [PATCH 11/36] Upgrade to Postgresql 42.2.25 Closes gh-29777 --- 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 fe7b34237d..68eec91e10 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1371,7 +1371,7 @@ bom { ] } } - library("Postgresql", "42.2.24") { + library("Postgresql", "42.2.25") { group("org.postgresql") { modules = [ "postgresql" From 0440147f412a3935c852da07e46058183fe0c605 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 09:01:15 +0100 Subject: [PATCH 12/36] Upgrade to SLF4J 1.7.36 Closes gh-29778 --- 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 68eec91e10..4bf54f0134 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1601,7 +1601,7 @@ bom { ] } } - library("SLF4J", "1.7.33") { + library("SLF4J", "1.7.36") { group("org.slf4j") { modules = [ "jcl-over-slf4j", From e9eba82c6c5469700f612f0ad0060fe1b1d5d604 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 09:01:16 +0100 Subject: [PATCH 13/36] Upgrade to Thymeleaf 3.0.15.RELEASE Closes gh-29779 --- 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 4bf54f0134..99a2043102 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1776,7 +1776,7 @@ bom { ] } } - library("Thymeleaf", "3.0.14.RELEASE") { + library("Thymeleaf", "3.0.15.RELEASE") { group("org.thymeleaf") { modules = [ "thymeleaf", From 2207bd88761cd0739e042732479a773db92e9c17 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 09:01:17 +0100 Subject: [PATCH 14/36] Upgrade to Tomcat 9.0.58 Closes gh-29780 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 62b45ba071..d676c0212b 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.56 +tomcatVersion=9.0.58 kotlin.stdlib.default.dependency=false From 4ee7b4b25ab96623f3c4ec140a4a2a91566dab1a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 09:01:19 +0100 Subject: [PATCH 15/36] Upgrade to Undertow 2.2.16.Final Closes gh-29781 --- 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 99a2043102..442118f197 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1839,7 +1839,7 @@ bom { ] } } - library("Undertow", "2.2.14.Final") { + library("Undertow", "2.2.16.Final") { group("io.undertow") { modules = [ "undertow-core", From 32dda9e730d6fbf7f2d92936b305e3aeab6f03c3 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:15:48 +0100 Subject: [PATCH 16/36] Upgrade to AppEngine SDK 1.9.94 Closes gh-29783 --- 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 7c6889dfe1..7a181ef469 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.93") { + library("AppEngine SDK", "1.9.94") { group("com.google.appengine") { modules = [ "appengine-api-1.0-sdk" From 7016693f0ec6758de48d9ad64bc03db98e94d895 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:15:50 +0100 Subject: [PATCH 17/36] Upgrade to Artemis 2.19.1 Closes gh-29784 --- 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 7a181ef469..5b23ace79b 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -70,7 +70,7 @@ bom { ] } } - library("Artemis", "2.19.0") { + library("Artemis", "2.19.1") { group("org.apache.activemq") { modules = [ "artemis-amqp-protocol", From 7375a5f52f5ecdd6077a583401129418f91d9d30 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:15:51 +0100 Subject: [PATCH 18/36] Upgrade to Couchbase Client 3.2.5 Closes gh-29785 --- 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 5b23ace79b..df51fac8b2 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.2.4") { + library("Couchbase Client", "3.2.5") { group("com.couchbase.client") { modules = [ "java-client" From e5f399b005c4f22fe1b1a4ea21ae245c979895a5 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:15:53 +0100 Subject: [PATCH 19/36] Upgrade to Dropwizard Metrics 4.2.8 Closes gh-29786 --- 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 df51fac8b2..8c59d5cf6d 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.2.7") { + library("Dropwizard Metrics", "4.2.8") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From 7800c9b1de8d512560b1507e080c4aa3821fe31b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:15:54 +0100 Subject: [PATCH 20/36] Upgrade to Glassfish JAXB 2.3.6 Closes gh-29787 --- 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 8c59d5cf6d..78614383e7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -348,7 +348,7 @@ bom { ] } } - library("Glassfish JAXB", "2.3.5") { + library("Glassfish JAXB", "2.3.6") { prohibit("[3.0.0-M1,)") { because "it uses the jakarta.* namespace" } From 60cf736e280a066e0a6acdc70c41a147745d5612 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:15:56 +0100 Subject: [PATCH 21/36] Upgrade to Hibernate 5.6.5.Final Closes gh-29788 --- 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 78614383e7..237102ac88 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("Hibernate", "5.6.4.Final") { + library("Hibernate", "5.6.5.Final") { prohibit("[6.0.0.Alpha2,)") { because "it uses the jakarta.* namespace" } From f2ab9c3b10f64b5d5f29f65c84ab3c2416dc6163 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:15:57 +0100 Subject: [PATCH 22/36] Upgrade to Hibernate Validator 6.2.2.Final Closes gh-29789 --- 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 237102ac88..4de5dbad45 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -441,7 +441,7 @@ bom { ] } } - library("Hibernate Validator", "6.2.0.Final") { + library("Hibernate Validator", "6.2.2.Final") { prohibit("[7.0.0.Alpha1,)") { because "it uses the jakarta.* namespace" } From 96e4cbbe04bfa123e0af76248653358592558ddd Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:15:59 +0100 Subject: [PATCH 23/36] Upgrade to HttpClient5 5.1.3 Closes gh-29790 --- 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 4de5dbad45..b901899325 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -504,7 +504,7 @@ bom { ] } } - library("HttpClient5", "5.1.2") { + library("HttpClient5", "5.1.3") { group("org.apache.httpcomponents.client5") { modules = [ "httpclient5", From dc171c6462eaf32ae0282400f2960818a9f74b1e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:16:00 +0100 Subject: [PATCH 24/36] Upgrade to Jetty 9.4.45.v20220203 Closes gh-29791 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../smoketest/jetty/jsp/SampleWebJspApplicationTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index b901899325..ddcabadfc3 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -904,7 +904,7 @@ bom { ] } } - library("Jetty", "9.4.44.v20210927") { + library("Jetty", "9.4.45.v20220203") { prohibit("[10.0.0-alpha0,)") { because "it requires Java 11" } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java index 22dd4b5882..359b8ec26c 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 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. @@ -59,7 +59,7 @@ class SampleWebJspApplicationTests { JettyServerCustomizer jettyServerCustomizer() { return (server) -> { ContextHandler handler = (ContextHandler) server.getHandler(); - handler.addAliasCheck(new ContextHandler.ApproveAliases()); + handler.addAliasCheck((path, resource) -> true); }; } From 82a0491afdb94351aba250f4f42469393ab68eb7 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:16:02 +0100 Subject: [PATCH 25/36] Upgrade to Johnzon 1.2.16 Closes gh-29793 --- 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 ddcabadfc3..cab3e8e890 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -924,7 +924,7 @@ bom { ] } } - library("Johnzon", "1.2.15") { + library("Johnzon", "1.2.16") { group("org.apache.johnzon") { modules = [ "johnzon-core", From b1160d676d11ded745a19677f116bde35c1744ef Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:16:04 +0100 Subject: [PATCH 26/36] Upgrade to Json-smart 2.4.8 Closes gh-29794 --- 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 cab3e8e890..1332633451 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -971,7 +971,7 @@ bom { ] } } - library("Json-smart", "2.4.7") { + library("Json-smart", "2.4.8") { group("net.minidev") { modules = [ "json-smart" From dd293cd86c23a707d45c6321785ae3345068ed30 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:16:06 +0100 Subject: [PATCH 27/36] Upgrade to Maven Javadoc Plugin 3.3.2 Closes gh-29795 --- 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 1332633451..93dd3befe4 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1184,7 +1184,7 @@ bom { ] } } - library("Maven Javadoc Plugin", "3.3.1") { + library("Maven Javadoc Plugin", "3.3.2") { group("org.apache.maven.plugins") { plugins = [ "maven-javadoc-plugin" From 57bc5136f5efe8a9a5e77fc909c10769a521e2a7 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:16:07 +0100 Subject: [PATCH 28/36] Upgrade to MongoDB 4.4.2 Closes gh-29796 --- 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 93dd3befe4..54aa0c2c58 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("MongoDB", "4.4.1") { + library("MongoDB", "4.4.2") { group("org.mongodb") { modules = [ "bson", From bb336e5e7bc82d8f404634ac42ba072870899805 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:16:09 +0100 Subject: [PATCH 29/36] Upgrade to Neo4j Java Driver 4.4.3 Closes gh-29797 --- 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 54aa0c2c58..40751d47d0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1288,7 +1288,7 @@ bom { ] } } - library("Neo4j Java Driver", "4.4.2") { + library("Neo4j Java Driver", "4.4.3") { group("org.neo4j.driver") { modules = [ "neo4j-java-driver" From 185c4968c2d0d9309b6e38a2e2a63790c4f03325 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:16:10 +0100 Subject: [PATCH 30/36] Upgrade to Netty 4.1.74.Final Closes gh-29798 --- 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 40751d47d0..c587bcb46e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1295,7 +1295,7 @@ bom { ] } } - library("Netty", "4.1.73.Final") { + library("Netty", "4.1.74.Final") { group("io.netty") { imports = [ "netty-bom" From b73c67e53eddc6ba1157f31cbbbd2c977c08e9a7 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:16:12 +0100 Subject: [PATCH 31/36] Upgrade to Netty tcNative 2.0.48.Final Closes gh-29799 --- 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 c587bcb46e..f1a7ad119d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1302,7 +1302,7 @@ bom { ] } } - library("Netty tcNative", "2.0.47.Final") { + library("Netty tcNative", "2.0.48.Final") { group("io.netty") { modules = [ "netty-tcnative", From 4a88b521a8b162daae867eeb759c40635beb94f1 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:16:13 +0100 Subject: [PATCH 32/36] Upgrade to Postgresql 42.3.2 Closes gh-29800 --- 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 f1a7ad119d..ba60960ede 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1345,7 +1345,7 @@ bom { ] } } - library("Postgresql", "42.3.1") { + library("Postgresql", "42.3.2") { group("org.postgresql") { modules = [ "postgresql" From 775ada2001a5ae1a779aa197871e3a681feaf45b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:16:15 +0100 Subject: [PATCH 33/36] Upgrade to SLF4J 1.7.36 Closes gh-29801 --- 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 ba60960ede..9f98227ee5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1576,7 +1576,7 @@ bom { ] } } - library("SLF4J", "1.7.33") { + library("SLF4J", "1.7.36") { group("org.slf4j") { modules = [ "jcl-over-slf4j", From 72fad9843a6cf9f3d648b69263682fb0385cdcbb Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:16:16 +0100 Subject: [PATCH 34/36] Upgrade to Thymeleaf 3.0.15.RELEASE Closes gh-29802 --- 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 9f98227ee5..ad55284c63 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1750,7 +1750,7 @@ bom { ] } } - library("Thymeleaf", "3.0.14.RELEASE") { + library("Thymeleaf", "3.0.15.RELEASE") { group("org.thymeleaf") { modules = [ "thymeleaf", From 0abf0703c65f80913211ffe0e60aa41c34e1c1a2 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:16:18 +0100 Subject: [PATCH 35/36] Upgrade to Tomcat 9.0.58 Closes gh-29803 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7857eb52e6..84abb08363 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.56 +tomcatVersion=9.0.58 kotlin.stdlib.default.dependency=false From f6a0fd5938d0268a2db256fdb1fedfcbdb7f998e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Feb 2022 13:18:06 +0100 Subject: [PATCH 36/36] Upgrade to Undertow 2.2.16.Final Closes gh-29804 --- 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 ad55284c63..fd5599a2f0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1813,7 +1813,7 @@ bom { ] } } - library("Undertow", "2.2.14.Final") { + library("Undertow", "2.2.16.Final") { group("io.undertow") { modules = [ "undertow-core",