From aaa6843b91d59dd65d0988147da6269cd2c7f81b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 11:50:05 +0000 Subject: [PATCH 1/8] Bump the java-test-dependencies group across 1 directory with 5 updates (#153) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c66ab74..a7b99a8 100644 --- a/pom.xml +++ b/pom.xml @@ -26,9 +26,9 @@ 3.1.8 - 5.10.3 - 5.12.0 - 2.6.9 + 5.11.3 + 5.14.2 + 2.7.0 10.0.3 From 71a99a9728d730ed38457046dd630d5974580a1e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 11:58:37 +0000 Subject: [PATCH 2/8] Bump the maven-build-plugins group across 1 directory with 6 updates (#152) --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index a7b99a8..9031851 100644 --- a/pom.xml +++ b/pom.xml @@ -31,8 +31,8 @@ 2.7.0 - 10.0.3 - 3.1.2 + 11.0.0 + 3.1.3 0.8.12 @@ -161,7 +161,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.7.1 + 3.8.1 jar-paths-to-properties @@ -189,7 +189,7 @@ maven-surefire-plugin - 3.3.1 + 3.5.1 @{surefire.jacoco.args} -javaagent:${net.bytebuddy:byte-buddy-agent:jar} @@ -213,7 +213,7 @@ maven-javadoc-plugin - 3.8.0 + 3.10.1 attach-javadocs @@ -292,7 +292,7 @@ maven-gpg-plugin - 3.2.4 + 3.2.7 sign-artifacts From 0cafca4df25f04bb40f1b306c85cbb7254a4fdae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 11:59:08 +0000 Subject: [PATCH 3/8] Bump the java-production-dependencies group across 1 directory with 2 updates (#150) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9031851..0e10956 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 22 - 1.3.1 + 1.4.0 0.7.0 2.0.16 3.1.8 @@ -90,7 +90,7 @@ org.jetbrains annotations - 24.1.0 + 26.0.1 provided From 1997f5682d41e9e82ea9afe59b25543c99a309c4 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 31 Oct 2024 13:43:44 +0100 Subject: [PATCH 4/8] exclude more log messages from mirror test by default --- .../cryptomator/frontend/fuse/mount/MirroringFuseMountTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/org/cryptomator/frontend/fuse/mount/MirroringFuseMountTest.java b/src/test/java/org/cryptomator/frontend/fuse/mount/MirroringFuseMountTest.java index a593106..f1ddca4 100644 --- a/src/test/java/org/cryptomator/frontend/fuse/mount/MirroringFuseMountTest.java +++ b/src/test/java/org/cryptomator/frontend/fuse/mount/MirroringFuseMountTest.java @@ -38,6 +38,7 @@ public static class Mirror { static { System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "debug"); + System.setProperty("org.slf4j.simpleLogger.log.org.cryptomator.frontend.fuse.locks.LockManager", "warn"); System.setProperty("org.slf4j.simpleLogger.log.org.cryptomator.frontend.fuse.locks.DataLock", "warn"); System.setProperty("org.slf4j.simpleLogger.log.org.cryptomator.frontend.fuse.locks.PathLock", "warn"); System.setProperty("org.slf4j.simpleLogger.showDateTime", "true"); @@ -63,6 +64,7 @@ public static class CryptoFsMirror { static { System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "debug"); + System.setProperty("org.slf4j.simpleLogger.log.org.cryptomator.frontend.fuse.locks.LockManager", "warn"); System.setProperty("org.slf4j.simpleLogger.log.org.cryptomator.frontend.fuse.locks.DataLock", "warn"); System.setProperty("org.slf4j.simpleLogger.log.org.cryptomator.frontend.fuse.locks.PathLock", "warn"); System.setProperty("org.slf4j.simpleLogger.showDateTime", "true"); From a8088ef7f2f79af16dfe9de61404187bf80fdce5 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 31 Oct 2024 13:45:59 +0100 Subject: [PATCH 5/8] specify key fingerprint for signing key --- .github/workflows/publish-central.yml | 3 ++- .github/workflows/publish-github.yml | 1 + pom.xml | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-central.yml b/.github/workflows/publish-central.yml index da62733..acf8746 100644 --- a/.github/workflows/publish-central.yml +++ b/.github/workflows/publish-central.yml @@ -34,4 +34,5 @@ jobs: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }} - MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import \ No newline at end of file + MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import + MAVEN_GPG_KEY_FINGERPRINT: "58117AFA1F85B3EEC154677D615D449FE6E6A235" \ No newline at end of file diff --git a/.github/workflows/publish-github.yml b/.github/workflows/publish-github.yml index 542787a..d72b640 100644 --- a/.github/workflows/publish-github.yml +++ b/.github/workflows/publish-github.yml @@ -21,6 +21,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }} MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import + MAVEN_GPG_KEY_FINGERPRINT: "58117AFA1F85B3EEC154677D615D449FE6E6A235" - name: Slack Notification uses: rtCamp/action-slack-notify@v2 env: diff --git a/pom.xml b/pom.xml index 0e10956..0c9b79f 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,7 @@ 2.7.0 + 3.2.7 11.0.0 3.1.3 0.8.12 @@ -292,7 +293,7 @@ maven-gpg-plugin - 3.2.7 + ${mvn-sign.version} sign-artifacts From b6d8664fb853debe52c8a9bb59f8a69e9209419f Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 31 Oct 2024 13:58:51 +0100 Subject: [PATCH 6/8] Fixes #125 --- .../java/org/cryptomator/frontend/fuse/ReadOnlyAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/cryptomator/frontend/fuse/ReadOnlyAdapter.java b/src/main/java/org/cryptomator/frontend/fuse/ReadOnlyAdapter.java index 7038592..d115e26 100644 --- a/src/main/java/org/cryptomator/frontend/fuse/ReadOnlyAdapter.java +++ b/src/main/java/org/cryptomator/frontend/fuse/ReadOnlyAdapter.java @@ -357,7 +357,7 @@ public int read(String path, ByteBuffer buf, long size, long offset, FileInfo fi @Override public int release(String path, FileInfo fi) { try (PathLock pathLock = lockManager.lockForReading(path); - DataLock _ = pathLock.lockDataForReading()) { + DataLock _ = pathLock.lockDataForWriting()) { LOG.trace("release {} ({})", path, fi.getFh()); fileHandler.release(fi); return 0; From e8736009459f10d15629856bc1f5df36304b17d4 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 31 Oct 2024 16:50:06 +0100 Subject: [PATCH 7/8] Closes #154 --- .../org/cryptomator/frontend/fuse/mount/FuseTMountProvider.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/cryptomator/frontend/fuse/mount/FuseTMountProvider.java b/src/main/java/org/cryptomator/frontend/fuse/mount/FuseTMountProvider.java index 6741a80..f74002e 100644 --- a/src/main/java/org/cryptomator/frontend/fuse/mount/FuseTMountProvider.java +++ b/src/main/java/org/cryptomator/frontend/fuse/mount/FuseTMountProvider.java @@ -72,6 +72,7 @@ public String getDefaultMountFlags() { // see: https://github.com/macos-fuse-t/fuse-t/wiki#supported-mount-options try { return MOUNT_OPTION_NOXATTR // + + " -obackend=smb" // + " -orwsize=262144" // + " -ouid=" + Files.getAttribute(USER_HOME, "unix:uid") // + " -ogid=" + Files.getAttribute(USER_HOME, "unix:gid"); From f7f163d696a5246ec308986a80eb735b8c1ae52e Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 31 Oct 2024 16:56:26 +0100 Subject: [PATCH 8/8] prepare 5.0.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0c9b79f..4a94104 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.cryptomator fuse-nio-adapter - 5.1.0-SNAPSHOT + 5.0.2 FUSE-NIO-Adapter Access resources at a given NIO path via FUSE. https://github.com/cryptomator/fuse-nio-adapter