From 0ba1496f61c418abb9008d14c3c0bfa4adc2024b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 17:58:24 +0000 Subject: [PATCH 01/17] Upgrade to Commons Codec 1.16.1 Closes gh-39566 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d1786b540b..d1f14de5e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.parallel=true org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 assertjVersion=3.24.2 -commonsCodecVersion=1.16.0 +commonsCodecVersion=1.16.1 commonsCompressVersion=1.21 hamcrestVersion=2.2 jacksonVersion=2.15.3 From ec5b259381daf282a163f468a90717bc007d259d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 17:58:29 +0000 Subject: [PATCH 02/17] Upgrade to Dropwizard Metrics 4.2.25 Closes gh-39567 --- 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 865e03e9f7..c498d93bcb 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -247,7 +247,7 @@ bom { ] } } - library("Dropwizard Metrics", "4.2.23") { + library("Dropwizard Metrics", "4.2.25") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From c0ec714e0a290923ce8503bd6a246240763f9500 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 17:58:33 +0000 Subject: [PATCH 03/17] Upgrade to Groovy 4.0.18 Closes gh-39568 --- 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 c498d93bcb..f675f1149c 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.17") { + library("Groovy", "4.0.18") { group("org.apache.groovy") { imports = [ "groovy-bom" From 7dc24370c6538e242aa0eaca59372ccacdd1af50 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 17:58:38 +0000 Subject: [PATCH 04/17] Upgrade to Hibernate 6.4.4.Final Closes gh-39569 --- 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 f675f1149c..aa43949e9c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -377,7 +377,7 @@ bom { ] } } - library("Hibernate", "6.4.1.Final") { + library("Hibernate", "6.4.4.Final") { group("org.hibernate.orm") { modules = [ "hibernate-agroal", From 4ee4215c8b49e0d40fe97ee86f77d1fa20c290fd Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 17:58:43 +0000 Subject: [PATCH 05/17] Upgrade to Infinispan 14.0.24.Final Closes gh-39570 --- 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 aa43949e9c..a98b6069ea 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -465,7 +465,7 @@ bom { ] } } - library("Infinispan", "14.0.21.Final") { + library("Infinispan", "14.0.24.Final") { group("org.infinispan") { imports = [ "infinispan-bom" From 6ea6aa42f7b3ecae4f634e79b344632f0ee5d7ed Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 17:58:47 +0000 Subject: [PATCH 06/17] Upgrade to Janino 3.1.12 Closes gh-39571 --- 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 a98b6069ea..f33dc42d82 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -606,7 +606,7 @@ bom { ] } } - library("Janino", "3.1.11") { + library("Janino", "3.1.12") { group("org.codehaus.janino") { modules = [ "commons-compiler", From 3a9987371cc60fd13cea98d7c2c2e412362db9ab Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 17:58:52 +0000 Subject: [PATCH 07/17] Upgrade to Jetty Reactive HTTPClient 4.0.3 Closes gh-39572 --- 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 f33dc42d82..a834df1674 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -671,7 +671,7 @@ bom { ] } } - library("Jetty Reactive HTTPClient", "4.0.1") { + library("Jetty Reactive HTTPClient", "4.0.3") { group("org.eclipse.jetty") { modules = [ "jetty-reactive-httpclient" From 1d4f0e78e6a7e2296bd07330ea737de579489cea Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 17:58:57 +0000 Subject: [PATCH 08/17] Upgrade to Jetty 12.0.6 Closes gh-39573 --- 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 a834df1674..e599825957 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -678,7 +678,7 @@ bom { ] } } - library("Jetty", "12.0.5") { + library("Jetty", "12.0.6") { group("org.eclipse.jetty.ee10") { imports = [ "jetty-ee10-bom" From 5c6f200b85a44deff1117a8f75bc877041f5e7ed Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 17:59:01 +0000 Subject: [PATCH 09/17] Upgrade to jOOQ 3.18.10 Closes gh-39574 --- 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 e599825957..4516c4ae80 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -697,7 +697,7 @@ bom { ] } } - library("jOOQ", "3.18.9") { + library("jOOQ", "3.18.10") { group("org.jooq") { modules = [ "jooq", From d16c3db912be922d0714afbe9cf868f3481c3ac3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 17:59:06 +0000 Subject: [PATCH 10/17] Upgrade to JUnit Jupiter 5.10.2 Closes gh-39575 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d1f14de5e3..7121b3e74e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ commonsCodecVersion=1.16.1 commonsCompressVersion=1.21 hamcrestVersion=2.2 jacksonVersion=2.15.3 -junitJupiterVersion=5.10.1 +junitJupiterVersion=5.10.2 kotlinVersion=1.9.22 mavenVersion=3.9.4 nativeBuildToolsVersion=0.9.28 From a7d78aee8bbe9241375ddffb5f840ae7a6c20a50 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 17:59:06 +0000 Subject: [PATCH 11/17] Upgrade to Micrometer 1.12.3 Closes gh-39474 --- 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 4516c4ae80..0bee836f95 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -995,7 +995,7 @@ bom { ] } } - library("Micrometer", "1.12.3-SNAPSHOT") { + library("Micrometer", "1.12.3") { considerSnapshots() group("io.micrometer") { modules = [ From 6536ee973a5a8d59c23348667df46bfbdcc893db Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 17:59:07 +0000 Subject: [PATCH 12/17] Upgrade to Micrometer Tracing 1.2.3 Closes gh-39475 --- 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 0bee836f95..89f6485d43 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1008,7 +1008,7 @@ bom { ] } } - library("Micrometer Tracing", "1.2.3-SNAPSHOT") { + library("Micrometer Tracing", "1.2.3") { considerSnapshots() calendarName = "Tracing" group("io.micrometer") { From a61a7b9d169ce7324ee20ee64ae7eb11aded8d3a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 17:59:12 +0000 Subject: [PATCH 13/17] Upgrade to Netty 4.1.107.Final Closes gh-39576 --- 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 89f6485d43..30b3ddba0e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1081,7 +1081,7 @@ bom { ] } } - library("Netty", "4.1.105.Final") { + library("Netty", "4.1.107.Final") { group("io.netty") { imports = [ "netty-bom" From 24572e46c9854b6e6a5e731c648a9d3b2ab701fc Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 17:59:16 +0000 Subject: [PATCH 14/17] Upgrade to SLF4J 2.0.12 Closes gh-39577 --- 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 30b3ddba0e..1382fdb0f7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1471,7 +1471,7 @@ bom { ] } } - library("SLF4J", "2.0.11") { + library("SLF4J", "2.0.12") { group("org.slf4j") { modules = [ "jcl-over-slf4j", From 90e46b941536d1d09cb95cecb0ee15917a59b7c6 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 17:59:23 +0000 Subject: [PATCH 15/17] Upgrade to Testcontainers 1.19.5 Closes gh-39578 --- 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 1382fdb0f7..4b38cf0661 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1641,7 +1641,7 @@ bom { ] } } - library("Testcontainers", "1.19.4") { + library("Testcontainers", "1.19.5") { group("org.testcontainers") { imports = [ "testcontainers-bom" From 6be9fdaeec3c4584d5a438cb6833513e3d83a9f8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 17:59:28 +0000 Subject: [PATCH 16/17] Upgrade to Undertow 2.3.11.Final Closes gh-39579 --- 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 4b38cf0661..67314a4265 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1701,7 +1701,7 @@ bom { ] } } - library("Undertow", "2.3.10.Final") { + library("Undertow", "2.3.11.Final") { group("io.undertow") { modules = [ "undertow-core", From 71abc9d6b7e60d1e67fdea4d8ebfb5c095c1118b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Feb 2024 18:58:19 +0000 Subject: [PATCH 17/17] fixup! Upgrade to Testcontainers 1.19.5 --- .../boot/image/assertions/ImageAssert.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/assertions/ImageAssert.java b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/assertions/ImageAssert.java index fc5f950941..ce326c1702 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/assertions/ImageAssert.java +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/assertions/ImageAssert.java @@ -80,12 +80,12 @@ public class ImageAssert extends AbstractAssert { this.actual.writeTo(out); try (TarArchiveInputStream in = new TarArchiveInputStream( new ByteArrayInputStream(out.toByteArray()))) { - TarArchiveEntry entry = in.getNextEntry(); + TarArchiveEntry entry = in.getNextTarEntry(); while (entry != null) { if (!entry.isDirectory()) { entryNames.add(entry.getName().replaceFirst("^/workspace/", "")); } - entry = in.getNextEntry(); + entry = in.getNextTarEntry(); } } } @@ -101,7 +101,7 @@ public class ImageAssert extends AbstractAssert { this.actual.writeTo(out); try (TarArchiveInputStream in = new TarArchiveInputStream( new ByteArrayInputStream(out.toByteArray()))) { - TarArchiveEntry entry = in.getNextEntry(); + TarArchiveEntry entry = in.getNextTarEntry(); while (entry != null) { if (entry.getName().equals(name)) { ByteArrayOutputStream entryOut = new ByteArrayOutputStream(); @@ -109,7 +109,7 @@ public class ImageAssert extends AbstractAssert { assertConsumer.accept(new JsonContentAssert(LayerContentAssert.class, entryOut.toString())); return; } - entry = in.getNextEntry(); + entry = in.getNextTarEntry(); } } failWithMessage("Expected JSON entry '%s' in layer with digest '%s'", name, this.actual.getId());