From d7410acbe58d5021cf6b0cf275ab9417242cd97e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:32:50 +0100 Subject: [PATCH 01/17] Upgrade to Byte Buddy 1.14.15 Closes gh-40720 --- 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 3d6bceb25d6..af76c54bd29 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -123,7 +123,7 @@ bom { ] } } - library("Byte Buddy", "1.14.13") { + library("Byte Buddy", "1.14.15") { group("net.bytebuddy") { modules = [ "byte-buddy", From 9130030ec8095a5b8d36e6b94847bae4548c3417 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:32:55 +0100 Subject: [PATCH 02/17] Upgrade to Dependency Management Plugin 1.1.5 Closes gh-40721 --- 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 af76c54bd29..e9f35ca738d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -228,7 +228,7 @@ bom { ] } } - library("Dependency Management Plugin", "1.1.4") { + library("Dependency Management Plugin", "1.1.5") { group("io.spring.gradle") { modules = [ "dependency-management-plugin" From 436ae02ee98e5e4a5cd03a7297a57860e3b044e2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:33:00 +0100 Subject: [PATCH 03/17] Upgrade to Hibernate 6.4.8.Final Closes gh-40722 --- 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 e9f35ca738d..50eb0e5c681 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -377,7 +377,7 @@ bom { ] } } - library("Hibernate", "6.4.4.Final") { + library("Hibernate", "6.4.8.Final") { group("org.hibernate.orm") { modules = [ "hibernate-agroal", From 96bdf1a8fcff0a4db2831e281dc030612a4e7654 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:33:05 +0100 Subject: [PATCH 04/17] Upgrade to Infinispan 14.0.28.Final Closes gh-40723 --- 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 50eb0e5c681..5f74f4b7f98 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -465,7 +465,7 @@ bom { ] } } - library("Infinispan", "14.0.27.Final") { + library("Infinispan", "14.0.28.Final") { group("org.infinispan") { imports = [ "infinispan-bom" From e0f93448f625561db4c816c9ea3a28dc1aed0083 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:33:10 +0100 Subject: [PATCH 05/17] Upgrade to Jetty 12.0.9 Closes gh-40724 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../web/embedded/jetty/JettyEmbeddedWebAppContext.java | 5 ++--- .../embedded/jetty/JettyServletWebServerFactoryTests.java | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 5f74f4b7f98..a940b15f6ea 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -678,7 +678,7 @@ bom { ] } } - library("Jetty", "12.0.8") { + library("Jetty", "12.0.9") { group("org.eclipse.jetty.ee10") { imports = [ "jetty-ee10-bom" diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyEmbeddedWebAppContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyEmbeddedWebAppContext.java index d583483a3dd..3bc9f30bbf8 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyEmbeddedWebAppContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyEmbeddedWebAppContext.java @@ -17,8 +17,8 @@ package org.springframework.boot.web.embedded.jetty; import org.eclipse.jetty.ee10.servlet.ServletHandler; -import org.eclipse.jetty.ee10.webapp.ClassMatcher; import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.util.ClassMatcher; /** * Jetty {@link WebAppContext} used by {@link JettyWebServer} to support deferred @@ -29,8 +29,7 @@ import org.eclipse.jetty.ee10.webapp.WebAppContext; class JettyEmbeddedWebAppContext extends WebAppContext { JettyEmbeddedWebAppContext() { - setServerClassMatcher(new ClassMatcher("org.springframework.boot.loader.")); - // setTempDirectory(WebInfConfiguration.getCanonicalNameForWebAppTmpDir(this)); + setHiddenClassMatcher(new ClassMatcher("org.springframework.boot.loader.")); } @Override diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java index acac3103c0b..a146c7ec5a6 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java @@ -44,7 +44,6 @@ import org.awaitility.Awaitility; import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler; import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.eclipse.jetty.ee10.webapp.AbstractConfiguration; -import org.eclipse.jetty.ee10.webapp.ClassMatcher; import org.eclipse.jetty.ee10.webapp.Configuration; import org.eclipse.jetty.ee10.webapp.WebAppContext; import org.eclipse.jetty.server.AbstractConnector; @@ -54,6 +53,7 @@ import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.SslConnectionFactory; +import org.eclipse.jetty.util.ClassMatcher; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.ThreadPool; @@ -193,8 +193,8 @@ class JettyServletWebServerFactoryTests extends AbstractServletWebServerFactoryT Configuration mockConfiguration(Class type) { Configuration mock = mock(type); ClassMatcher classMatcher = new ClassMatcher(); - given(mock.getSystemClasses()).willReturn(classMatcher); - given(mock.getServerClasses()).willReturn(classMatcher); + given(mock.getProtectedClasses()).willReturn(classMatcher); + given(mock.getHiddenClasses()).willReturn(classMatcher); return mock; } @@ -545,7 +545,7 @@ class JettyServletWebServerFactoryTests extends AbstractServletWebServerFactoryT } @Test - void shouldApplyingMaxConnectionUseConnector() throws Exception { + void shouldApplyingMaxConnectionUseConnector() { JettyServletWebServerFactory factory = getFactory(); factory.setMaxConnections(1); this.webServer = factory.getWebServer(); From a21831bc03771fb1399225327292b9c911b2d604 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:33:15 +0100 Subject: [PATCH 06/17] Upgrade to jOOQ 3.18.15 Closes gh-40725 --- 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 a940b15f6ea..879c8671a5a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -697,7 +697,7 @@ bom { ] } } - library("jOOQ", "3.18.14") { + library("jOOQ", "3.18.15") { group("org.jooq") { modules = [ "jooq", From a2355517e6dff748854773354c36e63252289a76 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:33:19 +0100 Subject: [PATCH 07/17] Upgrade to Kotlin 1.9.24 Closes gh-40726 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 88b3bc5754e..874c0ffb374 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ commonsCompressVersion=1.21 hamcrestVersion=2.2 jacksonVersion=2.15.4 junitJupiterVersion=5.10.2 -kotlinVersion=1.9.23 +kotlinVersion=1.9.24 mavenVersion=3.9.4 nativeBuildToolsVersion=0.9.28 springFrameworkVersion=6.1.7-SNAPSHOT From 4662009596b00ea8b572562394be7e99e8d73544 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:33:24 +0100 Subject: [PATCH 08/17] Upgrade to Maven Deploy Plugin 3.1.2 Closes gh-40727 --- 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 879c8671a5a..6a34eb8d7a5 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("Maven Deploy Plugin", "3.1.1") { + library("Maven Deploy Plugin", "3.1.2") { group("org.apache.maven.plugins") { plugins = [ "maven-deploy-plugin" From 3a34a38f9737f514a5355e9c301e5b4d96ebf240 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:33:28 +0100 Subject: [PATCH 09/17] Upgrade to Maven Install Plugin 3.1.2 Closes gh-40728 --- 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 6a34eb8d7a5..a5ea8c7ebbf 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -932,7 +932,7 @@ bom { ] } } - library("Maven Install Plugin", "3.1.1") { + library("Maven Install Plugin", "3.1.2") { group("org.apache.maven.plugins") { plugins = [ "maven-install-plugin" From 1f0b5fba4d0d6d95e4f1bb3bbc523c444452d531 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:33:33 +0100 Subject: [PATCH 10/17] Upgrade to Maven Shade Plugin 3.5.3 Closes gh-40729 --- 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 a5ea8c7ebbf..e1a76b32477 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -967,7 +967,7 @@ bom { ] } } - library("Maven Shade Plugin", "3.5.2") { + library("Maven Shade Plugin", "3.5.3") { group("org.apache.maven.plugins") { plugins = [ "maven-shade-plugin" From 9d018a27fa8466726c0cc473a33ce6d4980736d0 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:33:34 +0100 Subject: [PATCH 11/17] Upgrade to Micrometer 1.12.6 Closes gh-40655 --- 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 e1a76b32477..8fe6d0aeec4 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -995,7 +995,7 @@ bom { ] } } - library("Micrometer", "1.12.6-SNAPSHOT") { + library("Micrometer", "1.12.6") { considerSnapshots() group("io.micrometer") { modules = [ From 4e1fd41b9505c91a219cf76ea674b39a445a6531 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:33:38 +0100 Subject: [PATCH 12/17] Upgrade to Micrometer Tracing 1.2.6 Closes gh-40730 --- 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 8fe6d0aeec4..56fa52e7430 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1008,7 +1008,7 @@ bom { ] } } - library("Micrometer Tracing", "1.2.5") { + library("Micrometer Tracing", "1.2.6") { considerSnapshots() calendarName = "Tracing" group("io.micrometer") { From e1e29432e8e9af85e86f9c281ac7c404197c6b26 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:33:43 +0100 Subject: [PATCH 13/17] Upgrade to Pooled JMS 3.1.6 Closes gh-40731 --- 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 56fa52e7430..0ed5e1f2836 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1172,7 +1172,7 @@ bom { ] } } - library("Pooled JMS", "3.1.5") { + library("Pooled JMS", "3.1.6") { group("org.messaginghub") { modules = [ "pooled-jms" From 29be3e17231af7e2cb42a98c820dd2a0371f3bec Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:33:47 +0100 Subject: [PATCH 14/17] Upgrade to R2DBC Proxy 1.1.5.RELEASE Closes gh-40732 --- 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 0ed5e1f2836..9c61777144f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1346,7 +1346,7 @@ bom { ] } } - library("R2DBC Proxy", "1.1.4.RELEASE") { + library("R2DBC Proxy", "1.1.5.RELEASE") { considerSnapshots() group("io.r2dbc") { modules = [ From f9d0a6dd046caca50c384f618544482bea9029d5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:33:52 +0100 Subject: [PATCH 15/17] Upgrade to Testcontainers 1.19.8 Closes gh-40733 --- 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 9c61777144f..9b5a337e60e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1697,7 +1697,7 @@ bom { ] } } - library("Testcontainers", "1.19.7") { + library("Testcontainers", "1.19.8") { group("org.testcontainers") { imports = [ "testcontainers-bom" From 6f096c0b5f505828a63919f726871413f202ba10 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:33:56 +0100 Subject: [PATCH 16/17] Upgrade to Tomcat 10.1.23 Closes gh-40734 --- gradle.properties | 2 +- .../spring-boot-starter-tomcat/build.gradle | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 874c0ffb374..292012304d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,6 +14,6 @@ kotlinVersion=1.9.24 mavenVersion=3.9.4 nativeBuildToolsVersion=0.9.28 springFrameworkVersion=6.1.7-SNAPSHOT -tomcatVersion=10.1.20 +tomcatVersion=10.1.23 kotlin.stdlib.default.dependency=false diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle index f859ef7daee..acfe9c3ba37 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle @@ -12,5 +12,6 @@ dependencies { api("org.apache.tomcat.embed:tomcat-embed-el") api("org.apache.tomcat.embed:tomcat-embed-websocket") { exclude group: "org.apache.tomcat", module: "tomcat-annotations-api" + exclude group: "org.apache.tomcat", module: "tomcat-websocket-api" } } From 341035903a9732d801ffe44141ee3df58bda3844 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 13:34:01 +0100 Subject: [PATCH 17/17] Upgrade to Undertow 2.3.13.Final Closes gh-40735 --- 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 9b5a337e60e..cb8364e8bf2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1757,7 +1757,7 @@ bom { ] } } - library("Undertow", "2.3.12.Final") { + library("Undertow", "2.3.13.Final") { group("io.undertow") { modules = [ "undertow-core",