From c6bf1ac096009b9d8c50bc8e6a166307952238b4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 15:56:38 +0000 Subject: [PATCH 01/13] Upgrade to Byte Buddy 1.14.11 Closes gh-39184 --- 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 54afb5db2a..db982ef3af 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 335256505195e15c2a3b35ff3b723c51521f8a17 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 15:56:43 +0000 Subject: [PATCH 02/13] Upgrade to Groovy 4.0.17 Closes gh-39185 --- 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 db982ef3af..d92c91d895 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -339,7 +339,7 @@ bom { ] } } - library("Groovy", "4.0.16") { + library("Groovy", "4.0.17") { group("org.apache.groovy") { imports = [ "groovy-bom" From 112b07d0d5be8a494e7e3244aaa82e765c703e3e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 15:56:47 +0000 Subject: [PATCH 03/13] Upgrade to jOOQ 3.18.9 Closes gh-39186 --- 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 d92c91d895..5a63cfc6d3 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -701,7 +701,7 @@ bom { ] } } - library("jOOQ", "3.18.7") { + library("jOOQ", "3.18.9") { group("org.jooq") { modules = [ "jooq", From c34d334afe3f12d0c2a9c9fc5b88992f2c559509 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 15:56:52 +0000 Subject: [PATCH 04/13] Upgrade to Kotlin 1.9.22 Closes gh-39187 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 39b223c7fb..35feb8431a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ commonsCodecVersion=1.16.0 hamcrestVersion=2.2 jacksonVersion=2.15.3 junitJupiterVersion=5.10.1 -kotlinVersion=1.9.21 +kotlinVersion=1.9.22 mavenVersion=3.9.4 nativeBuildToolsVersion=0.9.28 springFrameworkVersion=6.1.3 From f1bc7c91f5242c7b4d66f2dc531da4b068db9718 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 15:56:57 +0000 Subject: [PATCH 05/13] Upgrade to Lettuce 6.3.1.RELEASE Closes gh-39188 --- 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 5a63cfc6d3..c757f3d7fc 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -825,7 +825,7 @@ bom { ] } } - library("Lettuce", "6.3.0.RELEASE") { + library("Lettuce", "6.3.1.RELEASE") { group("io.lettuce") { modules = [ "lettuce-core" From c151a8d0dd048df25c6783792c4a139eea8aea0c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 15:57:02 +0000 Subject: [PATCH 06/13] Upgrade to Netty 4.1.105.Final Closes gh-39189 --- 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 c757f3d7fc..0715a9a81c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1085,7 +1085,7 @@ bom { ] } } - library("Netty", "4.1.104.Final") { + library("Netty", "4.1.105.Final") { group("io.netty") { imports = [ "netty-bom" From 0ae22fd89f98520d89d6ebb41a092552f4daff99 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 15:57:06 +0000 Subject: [PATCH 07/13] Upgrade to Pulsar 3.1.2 Closes gh-39190 --- 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 0715a9a81c..e7c0f37f12 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1141,7 +1141,7 @@ bom { ] } } - library("Pulsar", "3.1.1") { + library("Pulsar", "3.1.2") { group("org.apache.pulsar") { modules = [ "bouncy-castle-bc", From bb2182cffd97dc4d45aa12a037e971adeda4b8dd Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 15:57:11 +0000 Subject: [PATCH 08/13] Upgrade to Pulsar Reactive 0.5.2 Closes gh-39191 --- 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 e7c0f37f12..fe72bdc80f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1220,7 +1220,7 @@ bom { ] } } - library("Pulsar Reactive", "0.5.1") { + library("Pulsar Reactive", "0.5.2") { group("org.apache.pulsar") { modules = [ "pulsar-client-reactive-adapter", From 41f4111faf3cc2957a892ec61b8c411a38140ce8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 15:57:16 +0000 Subject: [PATCH 09/13] Upgrade to R2DBC MySQL 1.0.6 Closes gh-39192 --- 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 fe72bdc80f..7d65333d17 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1271,7 +1271,7 @@ bom { ] } } - library("R2DBC MySQL", "1.0.5") { + library("R2DBC MySQL", "1.0.6") { group("io.asyncer") { modules = [ "r2dbc-mysql" From c7b769673cf0db8cb16c2b1794952fb67be891a6 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 15:57:20 +0000 Subject: [PATCH 10/13] Upgrade to R2DBC Postgresql 1.0.4.RELEASE Closes gh-39193 --- 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 7d65333d17..59bfb0aede 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1286,7 +1286,7 @@ bom { ] } } - library("R2DBC Postgresql", "1.0.3.RELEASE") { + library("R2DBC Postgresql", "1.0.4.RELEASE") { considerSnapshots() group("org.postgresql") { modules = [ From c901d09ecda42b1edfbe6ab15c4125e16e5f052a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 15:57:25 +0000 Subject: [PATCH 11/13] Upgrade to R2DBC Proxy 1.1.4.RELEASE Closes gh-39194 --- 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 59bfb0aede..240e59778c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1294,7 +1294,7 @@ bom { ] } } - library("R2DBC Proxy", "1.1.3.RELEASE") { + library("R2DBC Proxy", "1.1.4.RELEASE") { considerSnapshots() group("io.r2dbc") { modules = [ From 5a6c7245064adeb39e688d32c809870388f7d370 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 15:57:30 +0000 Subject: [PATCH 12/13] Upgrade to SLF4J 2.0.11 Closes gh-39195 --- 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 240e59778c..5c950fa090 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1475,7 +1475,7 @@ bom { ] } } - library("SLF4J", "2.0.9") { + library("SLF4J", "2.0.11") { group("org.slf4j") { modules = [ "jcl-over-slf4j", From f6fbd105f0e6d57021a64df1b45ea4708a67449c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jan 2024 15:57:35 +0000 Subject: [PATCH 13/13] Upgrade to Tomcat 10.1.18 Closes gh-39196 --- 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 35feb8431a..d6dd96dafc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,6 +13,6 @@ kotlinVersion=1.9.22 mavenVersion=3.9.4 nativeBuildToolsVersion=0.9.28 springFrameworkVersion=6.1.3 -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