From e2420caefd101b61a1e7470ab655d6910eb1316e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 14:05:45 +0000 Subject: [PATCH] Upgrade to Tomcat 10.1.18 Closes gh-39183 --- gradle.properties | 2 +- .../springframework/boot/web/server/mime-mappings.properties | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index bafd9091eaf..69774aaadaa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,6 +13,6 @@ kotlinVersion=1.8.22 mavenVersion=3.9.4 nativeBuildToolsVersion=0.9.28 springFrameworkVersion=6.0.16 -tomcatVersion=10.1.17 +tomcatVersion=10.1.18 kotlin.stdlib.default.dependency=false 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 4723c0b9327..f74b7c3e160 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 @@ -1,4 +1,4 @@ -# Copyright 2012-2022 the original author or authors. +# Copyright 2012-2024 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. @@ -293,6 +293,7 @@ gdl=model/vnd.gdl geo=application/vnd.dynageo gex=application/vnd.geometry-explorer ggb=application/vnd.geogebra.file +ggs=application/vnd.geogebra.slides ggt=application/vnd.geogebra.tool ghf=application/vnd.groove-help gif=image/gif @@ -469,6 +470,7 @@ mif=application/x-mif mime=message/rfc822 mj2=video/mj2 mjp2=video/mj2 +mjs=text/javascript mk3d=video/x-matroska mka=audio/x-matroska mks=video/x-matroska @@ -576,6 +578,7 @@ onetoc2=application/onenote opf=application/oebps-package+xml opml=text/x-opml oprc=application/vnd.palm +opus=audio/ogg org=application/vnd.lotus-organizer osf=application/vnd.yamaha.openscoreformat osfpvg=application/vnd.yamaha.openscoreformat.osfpvg+xml