Upgrade to Tomcat 10.1.8

Closes gh-35095
pull/34978/head
Andy Wilkinson 2 years ago
parent dbab743018
commit 26c98eded9

@ -5,7 +5,7 @@ org.gradle.parallel=true
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
kotlinVersion=1.8.20 kotlinVersion=1.8.20
tomcatVersion=10.1.7 tomcatVersion=10.1.8
nativeBuildToolsVersion=0.9.21 nativeBuildToolsVersion=0.9.21
kotlin.stdlib.default.dependency=false kotlin.stdlib.default.dependency=false

@ -259,7 +259,7 @@ public sealed class MimeMappings implements Iterable<MimeMappings.Mapping> {
mappings.add("jpe", "image/jpeg"); mappings.add("jpe", "image/jpeg");
mappings.add("jpeg", "image/jpeg"); mappings.add("jpeg", "image/jpeg");
mappings.add("jpg", "image/jpeg"); mappings.add("jpg", "image/jpeg");
mappings.add("js", "application/javascript"); mappings.add("js", "text/javascript");
mappings.add("json", "application/json"); mappings.add("json", "application/json");
mappings.add("otf", "font/otf"); mappings.add("otf", "font/otf");
mappings.add("pdf", "application/pdf"); mappings.add("pdf", "application/pdf");

@ -381,7 +381,7 @@ jpg=image/jpeg
jpgm=video/jpm jpgm=video/jpm
jpgv=video/jpeg jpgv=video/jpeg
jpm=video/jpm jpm=video/jpm
js=application/javascript js=text/javascript
jsf=text/plain jsf=text/plain
json=application/json json=application/json
jsonml=application/jsonml+json jsonml=application/jsonml+json

@ -221,7 +221,7 @@ class MimeMappingsTests {
.loadProperties(new ClassPathResource("mime-mappings.properties", getClass())); .loadProperties(new ClassPathResource("mime-mappings.properties", getClass()));
Properties tomcatDefaultMimeMappings = PropertiesLoaderUtils Properties tomcatDefaultMimeMappings = PropertiesLoaderUtils
.loadProperties(new ClassPathResource("MimeTypeMappings.properties", Tomcat.class)); .loadProperties(new ClassPathResource("MimeTypeMappings.properties", Tomcat.class));
assertThat(ourDefaultMimeMappings).isEqualTo(tomcatDefaultMimeMappings); assertThat(ourDefaultMimeMappings).containsExactlyInAnyOrderEntriesOf(tomcatDefaultMimeMappings);
} }
@Test @Test

Loading…
Cancel
Save