From 114857056ff391c5df2c7b6e91affb88e451ef50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jul 2023 22:47:51 +0000 Subject: [PATCH] deps(upgrade): bump com.github.marschall:memoryfilesystem from 2.1.0 to 2.6.1 Bumps [com.github.marschall:memoryfilesystem](https://github.com/marschall/memoryfilesystem) from 2.1.0 to 2.6.1. - [Release notes](https://github.com/marschall/memoryfilesystem/releases) - [Commits](https://github.com/marschall/memoryfilesystem/compare/2.1.0...2.6.1) --- updated-dependencies: - dependency-name: com.github.marschall:memoryfilesystem dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: Steve Todorov --- build.gradle.kts | 2 +- .../cloud/storage/s3fs/util/S3ClientMock.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index ca022b6c..2bb26dba 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -57,7 +57,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0") testImplementation("org.apache.commons:commons-lang3:3.12.0") testImplementation("com.github.marschall:zipfilesystem-standalone:1.0.1") - testImplementation("com.github.marschall:memoryfilesystem:2.1.0") + testImplementation("com.github.marschall:memoryfilesystem:2.6.1") testImplementation("org.mockito:mockito-core:3.9.0") testImplementation("org.mockito:mockito-inline:3.9.0") testImplementation("org.mockito:mockito-junit-jupiter:3.9.0") diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/util/S3ClientMock.java b/src/test/java/org/carlspring/cloud/storage/s3fs/util/S3ClientMock.java index 7c0c17bb..489c6175 100644 --- a/src/test/java/org/carlspring/cloud/storage/s3fs/util/S3ClientMock.java +++ b/src/test/java/org/carlspring/cloud/storage/s3fs/util/S3ClientMock.java @@ -32,6 +32,7 @@ import java.nio.file.StandardCopyOption; import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.FileAttribute; +import java.nio.file.attribute.PosixFileAttributeView; import java.nio.file.attribute.PosixFileAttributes; import java.nio.file.attribute.PosixFilePermission; import java.time.Instant; @@ -207,10 +208,22 @@ void addFile(final Path bucket, Path file = Files.createFile(bucket.resolve(fileName.replaceAll("/", "%2F")), attrs); + // This is needed for marschall/memoryfilesystem >= 2.6.1+ + PosixFileAttributeView fileAttributeView = file.getFileSystem().provider().getFileAttributeView(file, PosixFileAttributeView.class); + + Set perms = new HashSet<>(); + perms.add(PosixFilePermission.OWNER_WRITE); + perms.add(PosixFilePermission.OWNER_READ); + perms.add(PosixFilePermission.OWNER_EXECUTE); + + fileAttributeView.setPermissions(perms); + // /This is needed for marschall/memoryfilesystem >= 2.6.1+ + try (OutputStream outputStream = Files.newOutputStream(file)) { outputStream.write(content); } + } void addDirectory(final Path bucket,