From 1041b089e469de46034fd819ef0ab605ae547d16 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 12:57:00 +0000 Subject: [PATCH 01/11] Bump the maven-build-plugins group across 1 directory with 4 updates (#128) --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 567473a..6667a40 100644 --- a/pom.xml +++ b/pom.xml @@ -31,8 +31,8 @@ 2.6.9 - 9.1.0 - 3.1.1 + 9.2.0 + 3.1.2 0.8.12 @@ -213,7 +213,7 @@ maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -327,7 +327,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 + 1.7.0 true ossrh From ac5fba9cd7b5b8adf04873abab1b6f612e41a911 Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Fri, 7 Jun 2024 14:06:41 +0000 Subject: [PATCH 02/11] Hardening the CI in relation to PRs --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed68fbf..20510be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,8 @@ name: Build on: - [push] + push: + pull_request_target: + types: [labeled] jobs: build: name: Build and Test @@ -29,4 +31,4 @@ jobs: with: prerelease: true token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }} - generate_release_notes: true \ No newline at end of file + generate_release_notes: true From b7e179782499205917f0f0c7a233a69020913d67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 07:51:21 +0000 Subject: [PATCH 03/11] Bump the maven-build-plugins group across 1 directory with 4 updates (#132) --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 6667a40..9dcf2e3 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 2.6.9 - 9.2.0 + 10.0.2 3.1.2 0.8.12 @@ -161,7 +161,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.6.1 + 3.7.1 jar-paths-to-properties @@ -189,7 +189,7 @@ maven-surefire-plugin - 3.2.5 + 3.3.0 @{surefire.jacoco.args} -javaagent:${net.bytebuddy:byte-buddy-agent:jar} @@ -197,7 +197,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.1 + 3.4.2 maven-source-plugin From c72b67eeb36de6bfe550b300355b5104f28210a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 15:42:00 +0000 Subject: [PATCH 04/11] Bump the maven-build-plugins group across 1 directory with 3 updates (#134) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 9dcf2e3..362ec4b 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 2.6.9 - 10.0.2 + 10.0.3 3.1.2 0.8.12 @@ -189,7 +189,7 @@ maven-surefire-plugin - 3.3.0 + 3.3.1 @{surefire.jacoco.args} -javaagent:${net.bytebuddy:byte-buddy-agent:jar} @@ -213,7 +213,7 @@ maven-javadoc-plugin - 3.7.0 + 3.8.0 attach-javadocs From 4eaae970ef3fc0125e9ae268d37e10e66274dc77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 15:42:35 +0000 Subject: [PATCH 05/11] Bump the java-test-dependencies group across 1 directory with 4 updates (#131) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 362ec4b..c463431 100644 --- a/pom.xml +++ b/pom.xml @@ -26,8 +26,8 @@ 3.1.8 - 5.10.2 - 5.11.0 + 5.10.3 + 5.12.0 2.6.9 From 45f3531f73c52df18c1e833f83b329c9af1e0a82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 15:42:55 +0000 Subject: [PATCH 06/11] Bump the java-production-dependencies group with 2 updates (#135) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c463431..3511475 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 1.3.1 0.7.0 - 2.0.13 + 2.0.16 3.1.8 From f74394c6f36459857d53ea6321cb0811dda2d211 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 16 Aug 2024 17:43:34 +0200 Subject: [PATCH 07/11] change confusing logging message when opening a file --- .../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 ddeb7d4..7038592 100644 --- a/src/main/java/org/cryptomator/frontend/fuse/ReadOnlyAdapter.java +++ b/src/main/java/org/cryptomator/frontend/fuse/ReadOnlyAdapter.java @@ -322,7 +322,7 @@ public int open(String path, FileInfo fi) { try (PathLock pathLock = lockManager.lockForReading(path); DataLock _ = pathLock.lockDataForReading()) { Path node = resolvePath(fileNameTranscoder.fuseToNio(path)); - LOG.trace("open {} ({})", path, fi.getFh()); + LOG.trace("open {}", path); fileHandler.open(node, fi); return 0; } catch (NoSuchFileException e) { From c3b1315118baa0f3d4fdb4ee435cd0d1d6885aec Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 16 Aug 2024 17:46:47 +0200 Subject: [PATCH 08/11] migrate maven gpg plugin to use the bc signer --- .github/workflows/publish-central.yml | 5 ++--- .github/workflows/publish-github.yml | 3 +-- pom.xml | 5 +---- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish-central.yml b/.github/workflows/publish-central.yml index 68de332..da62733 100644 --- a/.github/workflows/publish-central.yml +++ b/.github/workflows/publish-central.yml @@ -21,8 +21,6 @@ jobs: server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml server-username: MAVEN_USERNAME # env variable for username in deploy server-password: MAVEN_PASSWORD # env variable for token in deploy - gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import - gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Enforce project version ${{ github.event.inputs.tag }} run: mvn versions:set -B -DnewVersion=${{ github.event.inputs.tag }} - name: Deploy @@ -35,4 +33,5 @@ jobs: --add-opens=java.desktop/java.awt.font=ALL-UNNAMED MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }} \ No newline at end of file + 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 diff --git a/.github/workflows/publish-github.yml b/.github/workflows/publish-github.yml index 0ab2eec..542787a 100644 --- a/.github/workflows/publish-github.yml +++ b/.github/workflows/publish-github.yml @@ -13,8 +13,6 @@ jobs: java-version: 22 distribution: 'zulu' cache: 'maven' - gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import - gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Enforce project version ${{ github.event.release.tag_name }} run: mvn versions:set -B -DnewVersion=${{ github.event.release.tag_name }} - name: Deploy @@ -22,6 +20,7 @@ jobs: env: 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 - name: Slack Notification uses: rtCamp/action-slack-notify@v2 env: diff --git a/pom.xml b/pom.xml index 3511475..c66ab74 100644 --- a/pom.xml +++ b/pom.xml @@ -301,10 +301,7 @@ sign - - --pinentry-mode - loopback - + bc From 82872438ffb09d5567f6ea4dde9498a0ff8989b9 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 18 Sep 2024 12:36:23 +0200 Subject: [PATCH 09/11] add default mount option to FUSE-T mounter --- .../cryptomator/frontend/fuse/mount/FuseTMountProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 e8deaf5..afb14dc 100644 --- a/src/main/java/org/cryptomator/frontend/fuse/mount/FuseTMountProvider.java +++ b/src/main/java/org/cryptomator/frontend/fuse/mount/FuseTMountProvider.java @@ -70,7 +70,8 @@ public int getDefaultLoopbackPort() { public String getDefaultMountFlags() { // see: https://github.com/macos-fuse-t/fuse-t/wiki#supported-mount-options try { - return "-orwsize=262144" // + return "-o nonamedattr"// + + " -orwsize=262144" // + " -ouid=" + Files.getAttribute(USER_HOME, "unix:uid") // + " -ogid=" + Files.getAttribute(USER_HOME, "unix:gid"); } catch (IOException e) { From 137e46ccfa494a3a598f339c79eca090f744383b Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 18 Sep 2024 12:45:44 +0200 Subject: [PATCH 10/11] always add nonamedattr option to fuse-t mounts --- .../cryptomator/frontend/fuse/mount/FuseTMountProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 afb14dc..6741a80 100644 --- a/src/main/java/org/cryptomator/frontend/fuse/mount/FuseTMountProvider.java +++ b/src/main/java/org/cryptomator/frontend/fuse/mount/FuseTMountProvider.java @@ -40,6 +40,7 @@ public class FuseTMountProvider implements MountService { private static final String DYLIB_PATH = "/usr/local/lib/libfuse-t.dylib"; private static final Path USER_HOME = Paths.get(System.getProperty("user.home")); + private static final String MOUNT_OPTION_NOXATTR = "-ononamedattr"; @Override public String displayName() { @@ -70,7 +71,7 @@ public int getDefaultLoopbackPort() { public String getDefaultMountFlags() { // see: https://github.com/macos-fuse-t/fuse-t/wiki#supported-mount-options try { - return "-o nonamedattr"// + return MOUNT_OPTION_NOXATTR // + " -orwsize=262144" // + " -ouid=" + Files.getAttribute(USER_HOME, "unix:uid") // + " -ogid=" + Files.getAttribute(USER_HOME, "unix:gid"); @@ -110,6 +111,7 @@ protected Set combinedMountFlags() { // if (port != 0) { // combined.add("-l 0:" + port); // } + combined.add(MOUNT_OPTION_NOXATTR); //required due to https://github.com/cryptomator/cryptomator/issues/3538 return combined; } From e77d86ef70bf144d6225855d9fb5331e168d1993 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 18 Sep 2024 12:48:25 +0200 Subject: [PATCH 11/11] prepare 5.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c66ab74..59ef6ef 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.1 FUSE-NIO-Adapter Access resources at a given NIO path via FUSE. https://github.com/cryptomator/fuse-nio-adapter