From 9ba954c3307e78a1fc5b61e1154036a5be531da8 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 8 Sep 2025 17:51:58 +0200 Subject: [PATCH 1/2] Fix FileSystemUtils for Windows/Linux path difference See gh-35443 --- .../java/org/springframework/util/FileSystemUtilsTests.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java b/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java index 8f8368bbf58..a402c7016dd 100644 --- a/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java @@ -84,7 +84,11 @@ class FileSystemUtilsTests { assertThat(new File(dest, "child")).exists(); assertThat(new File(dest, "child/bar.txt")).exists(); - URI uri = URI.create("jar:file:/" + dest.toString().replace('\\', '/') + "/archive.zip"); + String destPath = dest.toString().replace('\\', '/'); + if (!destPath.startsWith("/")) { + destPath = "/" + destPath; + } + URI uri = URI.create("jar:file:" + destPath + "/archive.zip"); Map env = Map.of("create", "true"); FileSystem zipfs = FileSystems.newFileSystem(uri, env); Path ziproot = zipfs.getPath("/"); From ebb8e345706ae99289566dc4e82602f26e82604a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 8 Sep 2025 18:11:27 +0200 Subject: [PATCH 2/2] Upgrade to Jetty 12.0.26, Jetty Reactive HttpClient 4.0.11, Netty 4.1.127, HtmlUnit 4.16 --- framework-platform/framework-platform.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 47de7e2da7e..a515e8ce933 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -9,15 +9,15 @@ javaPlatform { dependencies { api(platform("com.fasterxml.jackson:jackson-bom:2.18.4.1")) api(platform("io.micrometer:micrometer-bom:1.14.10")) - api(platform("io.netty:netty-bom:4.1.124.Final")) + api(platform("io.netty:netty-bom:4.1.127.Final")) api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) api(platform("io.projectreactor:reactor-bom:2024.0.9")) api(platform("io.rsocket:rsocket-bom:1.1.5")) api(platform("org.apache.groovy:groovy-bom:4.0.28")) api(platform("org.apache.logging.log4j:log4j-bom:2.21.1")) api(platform("org.assertj:assertj-bom:3.27.3")) - api(platform("org.eclipse.jetty:jetty-bom:12.0.25")) - api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.25")) + api(platform("org.eclipse.jetty:jetty-bom:12.0.26")) + api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.26")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3")) api(platform("org.junit:junit-bom:5.13.4")) @@ -115,7 +115,7 @@ dependencies { api("org.crac:crac:1.4.0") api("org.dom4j:dom4j:2.1.4") api("org.easymock:easymock:5.5.0") - api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.9") + api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.11") api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.4") api("org.eclipse:yasson:2.0.4") api("org.ehcache:ehcache:3.10.8") @@ -129,7 +129,7 @@ dependencies { api("org.hibernate:hibernate-core-jakarta:5.6.15.Final") api("org.hibernate:hibernate-validator:7.0.5.Final") api("org.hsqldb:hsqldb:2.7.4") - api("org.htmlunit:htmlunit:4.15.0") + api("org.htmlunit:htmlunit:4.16.0") api("org.javamoney:moneta:1.4.4") api("org.jruby:jruby:9.4.13.0") api("org.junit.support:testng-engine:1.0.5")