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 59ef6ef..4a94104 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.cryptomator fuse-nio-adapter - 5.0.1 + 5.0.2 FUSE-NIO-Adapter Access resources at a given NIO path via FUSE. https://github.com/cryptomator/fuse-nio-adapter @@ -20,19 +20,20 @@ 22 - 1.3.1 + 1.4.0 0.7.0 2.0.16 3.1.8 - 5.10.3 - 5.12.0 - 2.6.9 + 5.11.3 + 5.14.2 + 2.7.0 - 10.0.3 - 3.1.2 + 3.2.7 + 11.0.0 + 3.1.3 0.8.12 @@ -90,7 +91,7 @@ org.jetbrains annotations - 24.1.0 + 26.0.1 provided @@ -161,7 +162,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.7.1 + 3.8.1 jar-paths-to-properties @@ -189,7 +190,7 @@ maven-surefire-plugin - 3.3.1 + 3.5.1 @{surefire.jacoco.args} -javaagent:${net.bytebuddy:byte-buddy-agent:jar} @@ -213,7 +214,7 @@ maven-javadoc-plugin - 3.8.0 + 3.10.1 attach-javadocs @@ -292,7 +293,7 @@ maven-gpg-plugin - 3.2.4 + ${mvn-sign.version} sign-artifacts 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; 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"); 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");