From 444940c2c35eb62c8a9c121bbe765b43392609e7 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 14:05:02 +0000 Subject: [PATCH 01/10] Upgrade to Byte Buddy 1.14.11 Closes gh-39174 --- 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 8a7003b702..5e08684875 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.10") { + library("Byte Buddy", "1.14.11") { group("net.bytebuddy") { modules = [ "byte-buddy", From f118d5d971fe6046d5096ae473baa4138a061f06 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 14:05:07 +0000 Subject: [PATCH 02/10] Upgrade to Groovy 4.0.17 Closes gh-39175 --- 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 5e08684875..2f7e414eb4 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -327,7 +327,7 @@ bom { ] } } - library("Groovy", "4.0.16") { + library("Groovy", "4.0.17") { group("org.apache.groovy") { imports = [ "groovy-bom" From 06dfce6d5aae8d8bf46e52f6973fb9e515ae7bf1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 14:05:12 +0000 Subject: [PATCH 03/10] Upgrade to Hibernate 6.2.20.Final Closes gh-39176 --- 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 2f7e414eb4..30e6bc2fba 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -365,7 +365,7 @@ bom { ] } } - library("Hibernate", "6.2.17.Final") { + library("Hibernate", "6.2.20.Final") { group("org.hibernate.orm") { modules = [ "hibernate-agroal", From e6a26624d66e815947e5781ca3d625c0b20b422e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 14:05:17 +0000 Subject: [PATCH 04/10] Upgrade to jOOQ 3.18.9 Closes gh-39177 --- 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 30e6bc2fba..d44932e27d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -680,7 +680,7 @@ bom { ] } } - library("jOOQ", "3.18.8") { + library("jOOQ", "3.18.9") { group("org.jooq") { modules = [ "jooq", From 4e827873bc5efe6885c57e04bf86edee92b08c9c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 14:05:22 +0000 Subject: [PATCH 05/10] Upgrade to Netty 4.1.105.Final Closes gh-39178 --- 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 d44932e27d..c215cc1d7e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1061,7 +1061,7 @@ bom { ] } } - library("Netty", "4.1.104.Final") { + library("Netty", "4.1.105.Final") { group("io.netty") { imports = [ "netty-bom" From e57665843cd63fc8816b1db9688f40877421e389 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 14:05:26 +0000 Subject: [PATCH 06/10] Upgrade to R2DBC MySQL 1.0.6 Closes gh-39179 --- 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 c215cc1d7e..0aacef5729 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1157,7 +1157,7 @@ bom { ] } } - library("R2DBC MySQL", "1.0.5") { + library("R2DBC MySQL", "1.0.6") { group("io.asyncer") { modules = [ "r2dbc-mysql" From fee512d8218857dea492f93f8f22fdbea46013c1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 14:05:31 +0000 Subject: [PATCH 07/10] Upgrade to R2DBC Postgresql 1.0.4.RELEASE Closes gh-39180 --- 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 0aacef5729..686063d55f 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("R2DBC Postgresql", "1.0.3.RELEASE") { + library("R2DBC Postgresql", "1.0.4.RELEASE") { considerSnapshots() group("org.postgresql") { modules = [ From 40f352e53d371f5424932500afbe77e94c71bc72 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 14:05:35 +0000 Subject: [PATCH 08/10] Upgrade to R2DBC Proxy 1.1.4.RELEASE Closes gh-39181 --- 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 686063d55f..a4b9ac80ae 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1180,7 +1180,7 @@ bom { ] } } - library("R2DBC Proxy", "1.1.3.RELEASE") { + library("R2DBC Proxy", "1.1.4.RELEASE") { considerSnapshots() group("io.r2dbc") { modules = [ From 558d8131c0955de6898e1dbdc68ea73ad6005a72 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 14:05:40 +0000 Subject: [PATCH 09/10] Upgrade to SLF4J 2.0.11 Closes gh-39182 --- 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 a4b9ac80ae..c6eba60993 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1358,7 +1358,7 @@ bom { ] } } - library("SLF4J", "2.0.9") { + library("SLF4J", "2.0.11") { group("org.slf4j") { modules = [ "jcl-over-slf4j", From e2420caefd101b61a1e7470ab655d6910eb1316e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 14:05:45 +0000 Subject: [PATCH 10/10] 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 bafd9091ea..69774aaada 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 4723c0b932..f74b7c3e16 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