Skip to content

Commit b80f4cc

Browse files
committed
Upgrade to Tomcat 10.1.8
Closes gh-35089
1 parent ca618e8 commit b80f4cc

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ org.gradle.parallel=true
55
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
66

77
kotlinVersion=1.7.22
8-
tomcatVersion=10.1.7
8+
tomcatVersion=10.1.8
99
nativeBuildToolsVersion=0.9.21
1010

1111
kotlin.stdlib.default.dependency=false

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/MimeMappings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ static final class DefaultMimeMappings extends MimeMappings {
259259
mappings.add("jpe", "image/jpeg");
260260
mappings.add("jpeg", "image/jpeg");
261261
mappings.add("jpg", "image/jpeg");
262-
mappings.add("js", "application/javascript");
262+
mappings.add("js", "text/javascript");
263263
mappings.add("json", "application/json");
264264
mappings.add("otf", "font/otf");
265265
mappings.add("pdf", "application/pdf");

spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/web/server/mime-mappings.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ jpg=image/jpeg
381381
jpgm=video/jpm
382382
jpgv=video/jpeg
383383
jpm=video/jpm
384-
js=application/javascript
384+
js=text/javascript
385385
jsf=text/plain
386386
json=application/json
387387
jsonml=application/jsonml+json

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/MimeMappingsTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ void mimeMappingsMatchesTomcatDefaults() throws IOException {
221221
.loadProperties(new ClassPathResource("mime-mappings.properties", getClass()));
222222
Properties tomcatDefaultMimeMappings = PropertiesLoaderUtils
223223
.loadProperties(new ClassPathResource("MimeTypeMappings.properties", Tomcat.class));
224-
assertThat(ourDefaultMimeMappings).isEqualTo(tomcatDefaultMimeMappings);
224+
assertThat(ourDefaultMimeMappings).containsExactlyInAnyOrderEntriesOf(tomcatDefaultMimeMappings);
225225
}
226226

227227
@Test

0 commit comments

Comments
 (0)