Skip to content

Commit c5994f3

Browse files
committed
Merge branch 'release/5.0.4'
2 parents 3775053 + d04506c commit c5994f3

File tree

9 files changed

+34
-10
lines changed

9 files changed

+34
-10
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v4
1313
- uses: actions/setup-java@v4
1414
with:
15-
java-version: 22
15+
java-version: 23
1616
distribution: 'zulu'
1717
cache: 'maven'
1818
- name: Ensure to use tagged version

.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
fetch-depth: 2
2121
- uses: actions/setup-java@v4
2222
with:
23-
java-version: 22
23+
java-version: 23
2424
distribution: 'zulu'
2525
cache: 'maven'
2626
- name: Initialize CodeQL

.github/workflows/dependency-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
with:
1515
runner-os: 'ubuntu-latest'
1616
java-distribution: 'zulu'
17-
java-version: 22
17+
java-version: 23
1818
secrets:
1919
nvd-api-key: ${{ secrets.NVD_API_KEY }}
2020
slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/publish-central.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- uses: actions/checkout@v4
1010
- uses: actions/setup-java@v4
1111
with:
12-
java-version: 22
12+
java-version: 23
1313
distribution: 'zulu'
1414
cache: 'maven'
1515
server-id: central
@@ -24,4 +24,4 @@ jobs:
2424
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
2525
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
2626
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
27-
MAVEN_GPG_KEY_FINGERPRINT: "58117AFA1F85B3EEC154677D615D449FE6E6A235"
27+
MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}

.github/workflows/publish-github.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- uses: actions/checkout@v4
1111
- uses: actions/setup-java@v4
1212
with:
13-
java-version: 22
13+
java-version: 23
1414
distribution: 'zulu'
1515
cache: 'maven'
1616
- name: Enforce project version ${{ github.event.release.tag_name }}
@@ -21,4 +21,4 @@ jobs:
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2222
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
2323
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
24-
MAVEN_GPG_KEY_FINGERPRINT: "58117AFA1F85B3EEC154677D615D449FE6E6A235"
24+
MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}

.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CHANGELOG.md

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
6+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7+
8+
The changelog starts with version 5.0.4.
9+
Changes to prior versions can be found on the [Github release page](https://github.com/cryptomator/fuse-nio-adapter/releases).
10+
11+
## [5.0.4] - 24-03-2025
12+
13+
### Added
14+
15+
* changelog file
16+
* support libfuse3-4 on Linux (#174)
17+
18+
### Changed
19+
20+
* switch build to JDK 23 (fe75b0a0e627ddb7196806cc7c56ece1ef268cc7)
21+

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>org.cryptomator</groupId>
66
<artifactId>fuse-nio-adapter</artifactId>
7-
<version>5.0.3</version>
7+
<version>5.0.4</version>
88
<name>FUSE-NIO-Adapter</name>
99
<description>Access resources at a given NIO path via FUSE.</description>
1010
<url>https://github.com/cryptomator/fuse-nio-adapter</url>
@@ -17,7 +17,7 @@
1717

1818
<properties>
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20-
<project.build.jdk>22</project.build.jdk>
20+
<project.build.jdk>23</project.build.jdk>
2121

2222
<!-- dependencies -->
2323
<integrations-api.version>1.5.1</integrations-api.version>

src/main/java/org/cryptomator/frontend/fuse/mount/LinuxFuseMountProvider.java

+3
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,11 @@ public class LinuxFuseMountProvider implements MountService {
4141
private static final Path USER_HOME = Paths.get(System.getProperty("user.home"));
4242
private static final String[] LIB_PATHS = {
4343
"/lib/x86_64-linux-gnu/libfuse3.so.3", // debian amd64
44+
"/lib/x86_64-linux-gnu/libfuse3.so.4", // debian amd64
4445
"/lib/aarch64-linux-gnu/libfuse3.so.3", // debian aarch64
46+
"/lib/aarch64-linux-gnu/libfuse3.so.4", // debian aarch64
4547
"/usr/lib64/libfuse3.so.3", // fedora
48+
"/usr/lib64/libfuse3.so.4", // fedora
4649
"/app/lib/libfuse3.so" // flatpak
4750
};
4851
private static final String UNMOUNT_CMD_NAME = "fusermount3";

0 commit comments

Comments
 (0)