From 8afae11be2d90696eb30903bf73c3178ad492e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 13 May 2025 09:07:04 +0200 Subject: [PATCH 1/4] Upgrade to Jetty 12.0.21 Closes gh-45513 --- 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 9e2203f1b37..f2f32a9c6cc 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -966,7 +966,7 @@ bom { ] } } - library("Jetty", "12.0.20") { + library("Jetty", "12.0.21") { group("org.eclipse.jetty.ee10") { bom("jetty-ee10-bom") } From 48c765674fef7dde742f42658cb90762ed803558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 13 May 2025 09:07:04 +0200 Subject: [PATCH 2/4] Upgrade to Micrometer 1.13.14 Closes gh-45416 --- 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 f2f32a9c6cc..daef3200af4 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1407,7 +1407,7 @@ bom { releaseNotes("https://github.com/apache/maven-war-plugin/releases/tag/maven-war-plugin-{version}") } } - library("Micrometer", "1.13.14-SNAPSHOT") { + library("Micrometer", "1.13.14") { considerSnapshots() group("io.micrometer") { modules = [ From 1662f051d41cf4cfc3e4c24ad51106fbdf1475d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 13 May 2025 09:07:04 +0200 Subject: [PATCH 3/4] Upgrade to Micrometer Tracing 1.3.12 Closes gh-45418 --- 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 daef3200af4..b3515ec2056 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1429,7 +1429,7 @@ bom { releaseNotes("https://github.com/micrometer-metrics/micrometer/releases/tag/v{version}") } } - library("Micrometer Tracing", "1.3.12-SNAPSHOT") { + library("Micrometer Tracing", "1.3.12") { considerSnapshots() group("io.micrometer") { bom("micrometer-tracing-bom") From 09c79cce8579e4f789ae984d61b6f3f7f782165a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 13 May 2025 09:07:08 +0200 Subject: [PATCH 4/4] Upgrade to Tomcat 10.1.41 Closes gh-45514 --- gradle.properties | 2 +- .../embedded/tomcat/TomcatServletWebServerFactory.java | 10 ++++++++++ .../boot/web/server/mime-mappings.properties | 7 ++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 67cb364b789..1c65e605c1b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,6 +21,6 @@ nativeBuildToolsVersion=0.10.6 snakeYamlVersion=2.2 springFrameworkVersion=6.1.20-SNAPSHOT springFramework60xVersion=6.0.23 -tomcatVersion=10.1.40 +tomcatVersion=10.1.41 kotlin.stdlib.default.dependency=false diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java index 0fdaf21e18a..4cb8ebbff39 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java @@ -963,6 +963,16 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto this.delegate.gc(); } + @Override + public void setAllowLinking(boolean allowLinking) { + this.delegate.setAllowLinking(allowLinking); + } + + @Override + public boolean getAllowLinking() { + return this.delegate.getAllowLinking(); + } + @Override protected void initInternal() throws LifecycleException { if (this.delegate instanceof LifecycleBase) { diff --git a/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/web/server/mime-mappings.properties b/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/web/server/mime-mappings.properties index f74b7c3e160..02d4f465b32 100644 --- a/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/web/server/mime-mappings.properties +++ b/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/web/server/mime-mappings.properties @@ -61,6 +61,7 @@ atomsvc=application/atomsvc+xml atx=application/vnd.antix.game-component au=audio/basic avi=video/x-msvideo +avif=image/avif avx=video/x-rad-screenplay aw=application/applixware axa=audio/annodex @@ -387,6 +388,7 @@ jsf=text/plain json=application/json jsonml=application/jsonml+json jspf=text/plain +jxl=image/jxl kar=audio/midi karbon=application/vnd.kde.karbon kfo=application/vnd.kde.kformula @@ -429,6 +431,8 @@ m14=application/x-msmediaview m1v=video/mpeg m21=application/mp21 m2a=audio/mpeg +m2t=video/mp2t +m2ts=video/mp2t m2v=video/mpeg m3a=audio/mpeg m3u=audio/x-mpegurl @@ -521,7 +525,7 @@ msh=model/mesh msi=application/x-msdownload msl=application/vnd.mobius.msl msty=application/vnd.muvee.style -mts=model/vnd.mts +mts=video/mp2t mus=application/vnd.musician musicxml=application/vnd.recordare.musicxml+xml mvb=application/x-msmediaview @@ -838,6 +842,7 @@ tpt=application/vnd.trid.tpt tr=text/troff tra=application/vnd.trueapp trm=application/x-msterminal +ts=video/mp2t tsd=application/timestamped-data tsv=text/tab-separated-values ttc=font/collection