Merge branch 'release/5.0.2'

cryptomator · Oct 31, 2024 · fd81b82 · fd81b82
2 parents 6e06cea + f7f163d
commit fd81b82
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git 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
+          MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+          MAVEN_GPG_KEY_FINGERPRINT: "58117AFA1F85B3EEC154677D615D449FE6E6A235"
diff --git 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
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.cryptomator</groupId>
     <artifactId>fuse-nio-adapter</artifactId>
-    <version>5.0.1</version>
+    <version>5.0.2</version>
     <name>FUSE-NIO-Adapter</name>
     <description>Access resources at a given NIO path via FUSE.</description>
     <url>https://github.com/cryptomator/fuse-nio-adapter</url>
@@ -20,19 +20,20 @@
         <project.build.jdk>22</project.build.jdk>
 
         <!-- dependencies -->
-        <integrations-api.version>1.3.1</integrations-api.version>
+        <integrations-api.version>1.4.0</integrations-api.version>
         <jfuse.version>0.7.0</jfuse.version>
         <slf4j.version>2.0.16</slf4j.version>
         <caffeine.version>3.1.8</caffeine.version>
 
         <!-- test dependencies -->
-        <junit.jupiter.version>5.10.3</junit.jupiter.version>
-        <mockito.version>5.12.0</mockito.version>
-        <cryptofs.version>2.6.9</cryptofs.version>
+        <junit.jupiter.version>5.11.3</junit.jupiter.version>
+        <mockito.version>5.14.2</mockito.version>
+        <cryptofs.version>2.7.0</cryptofs.version>
 
         <!-- build dependencies -->
-        <dependency-check.version>10.0.3</dependency-check.version>
-        <maven.deploy.version>3.1.2</maven.deploy.version>
+        <mvn-sign.version>3.2.7</mvn-sign.version>
+        <dependency-check.version>11.0.0</dependency-check.version>
+        <maven.deploy.version>3.1.3</maven.deploy.version>
         <jacoco.version>0.8.12</jacoco.version>
     </properties>
 
@@ -90,7 +91,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>24.1.0</version>
+            <version>26.0.1</version>
             <scope>provided</scope>
         </dependency>
 
@@ -161,7 +162,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.7.1</version>
+                <version>3.8.1</version>
                 <executions>
                     <execution>
                         <id>jar-paths-to-properties</id>
@@ -189,7 +190,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.5.1</version>
                 <configuration>
                     <argLine>@{surefire.jacoco.args} -javaagent:${net.bytebuddy:byte-buddy-agent:jar}</argLine>
                 </configuration>
@@ -213,7 +214,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.10.1</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -292,7 +293,7 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.2.4</version>
+                        <version>${mvn-sign.version}</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>

diff --git 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
@@ -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
@@ -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");