Merge branch 'develop' into release/4.0.0

# Conflicts: # pom.xml
cryptomator · Sep 30, 2023 · a7a2443 · a7a2443
2 parents 81acc09 + 3f6d8a3
commit a7a2443
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
  - uses: actions/checkout@v3
  - uses: actions/setup-java@v3
  with:
- java-version: 21-ea
+ java-version: 21
  distribution: 'zulu'
  cache: 'maven'
  - name: Ensure to use tagged version

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -20,7 +20,7 @@ jobs:
  fetch-depth: 2
  - uses: actions/setup-java@v3
  with:
- java-version: 20
+ java-version: 21
  distribution: 'zulu'
  cache: 'maven'
  - name: Initialize CodeQL

diff --git a/.github/workflows/publish-central.yml b/.github/workflows/publish-central.yml
@@ -15,7 +15,7 @@ jobs:
  ref: "refs/tags/${{ github.event.inputs.tag }}"
  - uses: actions/setup-java@v3
  with:
- java-version: 21-ea
+ java-version: 21
  distribution: 'zulu'
  cache: 'maven'
  server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml

diff --git a/.github/workflows/publish-github.yml b/.github/workflows/publish-github.yml
@@ -10,7 +10,7 @@ jobs:
  - uses: actions/checkout@v3
  - uses: actions/setup-java@v3
  with:
- java-version: 21-ea
+ java-version: 21
  distribution: 'zulu'
  cache: 'maven'
  gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import

diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/pom.xml b/pom.xml
@@ -20,17 +20,15 @@
  <project.build.jdk>21</project.build.jdk>
 
  <!-- dependencies -->
-
- <!-- test dependencies -->
  <integrations-api.version>1.3.0</integrations-api.version>
- <jfuse.version>0.6.1</jfuse.version>
+ <jfuse.version>0.6.2</jfuse.version>
  <slf4j.version>2.0.7</slf4j.version>
  <caffeine.version>3.1.7</caffeine.version>
 
  <!-- test dependencies -->
  <junit.jupiter.version>5.10.0</junit.jupiter.version>
  <mockito.version>5.4.0</mockito.version>
- <cryptofs.version>2.6.6</cryptofs.version>
+ <cryptofs.version>2.6.7</cryptofs.version>
 
  <!-- build dependencies -->
  <dependency-check.version>8.3.1</dependency-check.version>

diff --git a/src/main/java/org/cryptomator/frontend/fuse/mount/LinuxFuseMountProvider.java b/src/main/java/org/cryptomator/frontend/fuse/mount/LinuxFuseMountProvider.java
@@ -40,7 +40,6 @@ public class LinuxFuseMountProvider implements MountService {
  private static final Logger LOG = LoggerFactory.getLogger(LinuxFuseMountProvider.class);
  private static final Path USER_HOME = Paths.get(System.getProperty("user.home"));
  private static final String[] LIB_PATHS = {
- "/usr/lib/libfuse3.so", // default
  "/lib/x86_64-linux-gnu/libfuse3.so.3", // debian amd64
  "/lib/aarch64-linux-gnu/libfuse3.so.3", // debian aarch64
  "/usr/lib64/libfuse3.so.3", // fedora
@@ -55,7 +54,7 @@ public String displayName() {
 
  @Override
  public boolean isSupported() {
- return Arrays.stream(LIB_PATHS).map(Path::of).anyMatch(Files::exists) && isFusermount3Installed();
+ return isFusermount3Installed();
  }
 
  private boolean isFusermount3Installed() {
@@ -115,9 +114,8 @@ public Mount mount() throws MountFailedException {
  Objects.requireNonNull(mountPoint);
  Objects.requireNonNull(mountFlags);
 
- var libPath = Arrays.stream(LIB_PATHS).map(Path::of).filter(Files::exists).map(Path::toString).findAny().orElseThrow();
  var builder = Fuse.builder();
- builder.setLibraryPath(libPath);
+ Arrays.stream(LIB_PATHS).map(Path::of).filter(Files::exists).map(Path::toString).findAny().ifPresent(builder::setLibraryPath);
  if (mountFlags.contains("-oallow_other") || mountFlags.contains("-oallow_root")) {
  LOG.warn("Mounting with flag -oallow_other or -oallow_root. Ensure that in /etc/fuse.conf option user_allow_other is enabled.");
  }