root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch '6.2.x' 

# Conflicts:
#	framework-platform/framework-platform.gradle
This commit is contained in:
Juergen Hoeller 2025-09-08 18:23:37 +02:00
parent a053e6594c ebb8e34570
commit 5be5843cb7
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework-platform/framework-platform.gradle
View File

@ -111,7 +111,7 @@ dependencies {
api("org.dom4j:dom4j:2.1.4")
api("org.easymock:easymock:5.5.0")
api("org.eclipse.angus:angus-mail:2.0.3")
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:5.0.0-B08")
api("org.eclipse:yasson:3.0.4")
api("org.ehcache:ehcache:3.10.8")
@ -124,7 +124,7 @@ dependencies {
api("org.hibernate.orm:hibernate-core:7.1.0.Final")
api("org.hibernate.validator:hibernate-validator:9.0.1.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.jboss.logging:jboss-logging:3.6.1.Final")
api("org.jruby:jruby:10.0.2.0")

6
spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java
View File

@ -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<String, String> env = Map.of("create", "true");
FileSystem zipfs = FileSystems.newFileSystem(uri, env);
Path ziproot = zipfs.getPath("/");