From a3762b3f086f68636ce32316b42bf4bd129202b3 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 13 Sep 2021 10:09:54 +0200 Subject: [PATCH 01/12] Upgrade to Ehcache3 3.9.6 Closes gh-27951 --- 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 23d6be19045..e65a3810829 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -262,7 +262,7 @@ bom { ] } } - library("Ehcache3", "3.9.5") { + library("Ehcache3", "3.9.6") { group("org.ehcache") { modules = [ "ehcache", From a5b5b2d10f8bdbb8568d4a22c82a4287444d1586 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 13 Sep 2021 10:09:56 +0200 Subject: [PATCH 02/12] Upgrade to Glassfish EL 3.0.4 Closes gh-27952 --- 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 e65a3810829..27de3cb9d9c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -331,7 +331,7 @@ bom { ] } } - library("Glassfish EL", "3.0.3") { + library("Glassfish EL", "3.0.4") { group("org.glassfish") { modules = [ "jakarta.el" From 6eedf9cfe4a52af7e00cd1142f288443dc83e59c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 13 Sep 2021 10:09:57 +0200 Subject: [PATCH 03/12] Upgrade to Groovy 2.5.15 Closes gh-27953 --- 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 27de3cb9d9c..1b6820a88f8 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -352,7 +352,7 @@ bom { ] } } - library("Groovy", "2.5.14") { + library("Groovy", "2.5.15") { group("org.codehaus.groovy") { imports = [ "groovy-bom" From d09beaf9686532913e06990bfd2f22171d9ecc9b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 13 Sep 2021 10:09:58 +0200 Subject: [PATCH 04/12] Upgrade to Gson 2.8.8 Closes gh-27954 --- 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 1b6820a88f8..1cc11cdc594 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -359,7 +359,7 @@ bom { ] } } - library("Gson", "2.8.7") { + library("Gson", "2.8.8") { group("com.google.code.gson") { modules = [ "gson" From 0e3ac71857f2021c6a47dd21a53b6bced162ffdf Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 13 Sep 2021 10:09:59 +0200 Subject: [PATCH 05/12] Upgrade to Jetty EL 8.5.70 Closes gh-27955 --- 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 1cc11cdc594..a865215436e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -775,7 +775,7 @@ bom { ] } } - library("Jetty EL", "8.5.68") { + library("Jetty EL", "8.5.70") { group("org.mortbay.jasper") { modules = [ "apache-el" From 3276c977e354aa6c9d41cfa8f5be79c6363af8b9 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 13 Sep 2021 10:10:00 +0200 Subject: [PATCH 06/12] Upgrade to jOOQ 3.14.14 Closes gh-27956 --- 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 a865215436e..95a037e07ac 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -833,7 +833,7 @@ bom { ] } } - library("jOOQ", "3.14.13") { + library("jOOQ", "3.14.14") { group("org.jooq") { modules = [ "jooq", From fadf5ba33ab9ba50108c79ad981a5ee3da91903e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 13 Sep 2021 10:10:01 +0200 Subject: [PATCH 07/12] Upgrade to Logback 1.2.6 Closes gh-27957 --- 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 95a037e07ac..ada70e33cac 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -963,7 +963,7 @@ bom { ] } } - library("Logback", "1.2.5") { + library("Logback", "1.2.6") { group("ch.qos.logback") { modules = [ "logback-access", From 21c53729abcf00ac5a08fa4fb050d5874ab5c276 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 13 Sep 2021 10:10:03 +0200 Subject: [PATCH 08/12] Upgrade to Maven War Plugin 3.3.2 Closes gh-27958 --- 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 ada70e33cac..f42dc1b6f26 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("Maven War Plugin", "3.3.1") { + library("Maven War Plugin", "3.3.2") { group("org.apache.maven.plugins") { plugins = [ "maven-war-plugin" From c8ea3af6f7d42c1fb01baffb1df86e3dcdc3caa8 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 13 Sep 2021 10:10:04 +0200 Subject: [PATCH 09/12] Upgrade to Netty 4.1.68.Final Closes gh-27959 --- 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 f42dc1b6f26..53b19898e2d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1181,7 +1181,7 @@ bom { ] } } - library("Netty", "4.1.67.Final") { + library("Netty", "4.1.68.Final") { group("io.netty") { imports = [ "netty-bom" From 97f3c82743ff5f8a764aa1016a69b5fac462ce73 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 13 Sep 2021 10:10:05 +0200 Subject: [PATCH 10/12] Upgrade to Netty tcNative 2.0.42.Final Closes gh-27960 --- 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 53b19898e2d..922eeab533f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1188,7 +1188,7 @@ bom { ] } } - library("Netty tcNative", "2.0.40.Final") { + library("Netty tcNative", "2.0.42.Final") { group("io.netty") { modules = [ "netty-tcnative", From ab81e3c05c3ca8c91560f0d27eca2e8099c3c06d Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 13 Sep 2021 10:10:06 +0200 Subject: [PATCH 11/12] Upgrade to Tomcat 9.0.53 Closes gh-27961 --- gradle.properties | 2 +- .../springframework/boot/web/embedded/tomcat/TldPatterns.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 74934f1b3ef..b4837592909 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.4.32 -tomcatVersion=9.0.52 +tomcatVersion=9.0.53 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 48a312e1900..0b8b07b5642 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 @@ -61,6 +61,7 @@ final class TldPatterns { skipPatterns.add("commons-logging*.jar"); skipPatterns.add("commons-math*.jar"); skipPatterns.add("commons-pool*.jar"); + skipPatterns.add("derby-*.jar"); skipPatterns.add("dom4j-*.jar"); skipPatterns.add("easymock-*.jar"); skipPatterns.add("ecj-*.jar"); From 2004c062df3945b13a075665dc394aa19dee5bb3 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 13 Sep 2021 11:04:02 +0200 Subject: [PATCH 12/12] Upgrade to Tomcat 9.0.53 Closes gh-27963 --- gradle.properties | 2 +- .../springframework/boot/web/embedded/tomcat/TldPatterns.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7ff849526f8..32fe13d422c 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.21 -tomcatVersion=9.0.52 +tomcatVersion=9.0.53 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 48a312e1900..0b8b07b5642 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 @@ -61,6 +61,7 @@ final class TldPatterns { skipPatterns.add("commons-logging*.jar"); skipPatterns.add("commons-math*.jar"); skipPatterns.add("commons-pool*.jar"); + skipPatterns.add("derby-*.jar"); skipPatterns.add("dom4j-*.jar"); skipPatterns.add("easymock-*.jar"); skipPatterns.add("ecj-*.jar");