From cf173f6eb94d666437e1df8c7ad14337c8e773cb Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Mon, 11 Dec 2023 23:04:51 +0100 Subject: [PATCH 01/30] update dependecy-check to 9.0.4 and refactor it to own workflow --- .github/workflows/build.yml | 4 +- .github/workflows/dependency-check.yml | 54 ++++++++++++++++++++++++++ pom.xml | 8 ++-- 3 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/dependency-check.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 555d6b7..cc122cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,10 +15,10 @@ jobs: cache: 'maven' - name: Ensure to use tagged version if: startsWith(github.ref, 'refs/tags/') - run: mvn versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/} + run: mvn -B versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/} - name: Build and Test id: buildAndTest - run: mvn -B clean install jacoco:report -Pcoverage,dependency-check + run: mvn -B clean install jacoco:report -Pcoverage - name: Upload code coverage report id: codacyCoverageReporter run: bash <(curl -Ls https://coverage.codacy.com/get.sh) diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml new file mode 100644 index 0000000..45d69ba --- /dev/null +++ b/.github/workflows/dependency-check.yml @@ -0,0 +1,54 @@ +name: OWASP Maven Dependency Check +on: + schedule: + - cron: '0 7 * * 0' + push: + branches: + - 'release/**' + workflow_dispatch: + + +jobs: + check-dependencies: + name: Check dependencies + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + show-progress: false + - name: Setup Java + uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: 21 + cache: 'maven' + - name: Run org.owasp:dependency-check plugin + id: dependency-check + continue-on-error: true + run: mvn -B verify -Pdependency-check -DskipTests + env: + NVD_API_KEY: ${{ secrets.NVD_API_KEY }} + - name: Upload report on failure + if: steps.dependency-check.outcome == 'failure' + uses: actions/upload-artifact@v3 + with: + name: dependency-check-report + path: target/dependency-check-report.html + if-no-files-found: error + - name: Slack Notification on regular check + if: github.event_name == 'schedule' && steps.dependency-check.outcome == 'failure' + uses: rtCamp/action-slack-notify@v2 + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} + SLACK_USERNAME: 'Cryptobot' + SLACK_ICON: false + SLACK_ICON_EMOJI: ':bot:' + SLACK_CHANNEL: 'cryptomator-desktop' + SLACK_TITLE: "Vulnerabilities in ${{ github.event.repository.name }} detected." + SLACK_MESSAGE: "Download the for more details." + SLACK_FOOTER: false + MSG_MINIMAL: true + - name: Failing workflow on release branch + if: github.event_name == 'push' && steps.dependency-check.outcome == 'failure' + shell: bash + run: exit 1 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4c41e4c..632cc8e 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 2.6.7 - 8.4.2 + 9.0.4 3.1.1 0.8.11 @@ -236,13 +236,11 @@ dependency-check-maven ${dependency-check.version} - 24 0 true true - - suppression.xml - + suppression.xml + ${env.NVD_API_KEY} From 12bd1dc7d5c4c70ae3e6e2ceff9a5fbbcb3f0d8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 15:08:08 +0000 Subject: [PATCH 02/30] Bump the java-test-dependencies group with 5 updates (#92) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 632cc8e..d44394d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,9 +26,9 @@ 3.1.8 - 5.10.0 - 5.6.0 - 2.6.7 + 5.10.1 + 5.8.0 + 2.6.8 9.0.4 From 22880e9232489d4595a383e9a11afbafb92196c0 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 13 Dec 2023 16:40:26 +0100 Subject: [PATCH 03/30] use separate cache for dependency-cache data --- .github/workflows/dependency-check.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index 45d69ba..580a9c3 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -22,6 +22,15 @@ jobs: distribution: 'zulu' java-version: 21 cache: 'maven' + - name: Cache NVD DB + uses: actions/cache@v3 + with: + path: ~/.m2/repository/org/owasp/dependency-check-data/ + key: dependency-check-${{ github.run_id }} + restore-keys: | + dependency-check + env: + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5 - name: Run org.owasp:dependency-check plugin id: dependency-check continue-on-error: true From 5942f49f707353d05673ee1d3b26592f41dd104c Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 13 Dec 2023 16:40:47 +0100 Subject: [PATCH 04/30] adjust dependency check plugin --- .github/workflows/dependency-check.yml | 2 +- pom.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index 580a9c3..60b7381 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -34,7 +34,7 @@ jobs: - name: Run org.owasp:dependency-check plugin id: dependency-check continue-on-error: true - run: mvn -B verify -Pdependency-check -DskipTests + run: mvn -B validate -Pdependency-check env: NVD_API_KEY: ${{ secrets.NVD_API_KEY }} - name: Upload report on failure diff --git a/pom.xml b/pom.xml index d44394d..6e057ba 100644 --- a/pom.xml +++ b/pom.xml @@ -236,6 +236,7 @@ dependency-check-maven ${dependency-check.version} + 24 0 true true @@ -247,6 +248,7 @@ check + validate From c8429da06d6e564d6a9685b7be76f0165c0eecc5 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Mon, 18 Dec 2023 10:50:12 +0100 Subject: [PATCH 05/30] Update dependency-check.yml to not run into 403 due to rate limit --- .github/workflows/dependency-check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index 60b7381..7078ab2 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -1,7 +1,7 @@ name: OWASP Maven Dependency Check on: schedule: - - cron: '0 7 * * 0' + - cron: '0 9 * * 0' push: branches: - 'release/**' @@ -60,4 +60,4 @@ jobs: - name: Failing workflow on release branch if: github.event_name == 'push' && steps.dependency-check.outcome == 'failure' shell: bash - run: exit 1 \ No newline at end of file + run: exit 1 From 6f921cdbaefa3c5518cacd5fe43ffb30ef2fb423 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 19 Dec 2023 12:11:04 +0100 Subject: [PATCH 06/30] allow byte-buddy as a dynamically loaded java-agent See also https://github.com/mockito/mockito/issues/3037#issuecomment-1793424678 --- pom.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e057ba..21310f2 100644 --- a/pom.xml +++ b/pom.xml @@ -161,6 +161,19 @@ + + org.apache.maven.plugins + maven-dependency-plugin + 3.6.1 + + + jar-paths-to-properties + + properties + + + + org.jacoco jacoco-maven-plugin @@ -181,7 +194,7 @@ maven-surefire-plugin 3.2.1 - @{surefire.jacoco.args} --enable-preview --enable-native-access=ALL-UNNAMED + @{surefire.jacoco.args} -javaagent:${net.bytebuddy:byte-buddy-agent:jar} --enable-preview --enable-native-access=ALL-UNNAMED From e4e0eabd84f6f0e246b8332387a3748092c800b1 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 19 Dec 2023 13:03:59 +0100 Subject: [PATCH 07/30] allow native acccess only to jfuse modules --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 21310f2..7ba3689 100644 --- a/pom.xml +++ b/pom.xml @@ -194,7 +194,7 @@ maven-surefire-plugin 3.2.1 - @{surefire.jacoco.args} -javaagent:${net.bytebuddy:byte-buddy-agent:jar} --enable-preview --enable-native-access=ALL-UNNAMED + @{surefire.jacoco.args} -javaagent:${net.bytebuddy:byte-buddy-agent:jar} --enable-preview --enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.cryptomator.jfuse.mac,org.cryptomator.jfuse.win From be5448a649189e118653a5a6a5f60aacd447f251 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 19 Dec 2023 13:04:14 +0100 Subject: [PATCH 08/30] remove codacy upload --- .github/workflows/build.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc122cc..79ee123f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,12 +19,6 @@ jobs: - name: Build and Test id: buildAndTest run: mvn -B clean install jacoco:report -Pcoverage - - name: Upload code coverage report - id: codacyCoverageReporter - run: bash <(curl -Ls https://coverage.codacy.com/get.sh) - env: - CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }} - continue-on-error: true - uses: actions/upload-artifact@v3 with: name: artifacts From b44e4007634dd2602b19ddd103b45264df10b97f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 12:09:52 +0000 Subject: [PATCH 09/30] Bump the maven-build-plugins group with 4 updates (#97) --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 7ba3689..b45f734 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 2.6.8 - 9.0.4 + 9.0.7 3.1.1 0.8.11 @@ -152,7 +152,7 @@ maven-compiler-plugin - 3.11.0 + 3.12.0 true ${project.build.jdk} @@ -192,7 +192,7 @@ maven-surefire-plugin - 3.2.1 + 3.2.3 @{surefire.jacoco.args} -javaagent:${net.bytebuddy:byte-buddy-agent:jar} --enable-preview --enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.cryptomator.jfuse.mac,org.cryptomator.jfuse.win @@ -216,7 +216,7 @@ maven-javadoc-plugin - 3.6.0 + 3.6.3 attach-javadocs From 344abe2aa0ac4fa513ba9ec4bcbdc110ccc17a70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Dec 2023 04:30:50 +0000 Subject: [PATCH 10/30] Bump the maven-build-plugins group with 1 update (#98) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b45f734..92afeb5 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ maven-compiler-plugin - 3.12.0 + 3.12.1 true ${project.build.jdk} From 5dd8e1bbf7581597687b78cbbd7fcfc07186ea3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:02:29 +0000 Subject: [PATCH 11/30] Bump the github-actions group with 2 updates (#99) --- .github/workflows/build.yml | 2 +- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/dependency-check.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79ee123f..7c1e171 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - name: Build and Test id: buildAndTest run: mvn -B clean install jacoco:report -Pcoverage - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: artifacts path: target/*.jar diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3d22e02..7cdc153 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -24,10 +24,10 @@ jobs: distribution: 'zulu' cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: java - name: Build run: mvn -B compile - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 \ No newline at end of file + uses: github/codeql-action/analyze@v3 \ No newline at end of file diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index 7078ab2..a153b18 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -39,7 +39,7 @@ jobs: NVD_API_KEY: ${{ secrets.NVD_API_KEY }} - name: Upload report on failure if: steps.dependency-check.outcome == 'failure' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dependency-check-report path: target/dependency-check-report.html From 83abd6df93f4b543567292a4d9bc313099ddfc74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:03:57 +0000 Subject: [PATCH 12/30] Bump the java-test-dependencies group with 1 update (#104) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 92afeb5..29c0a53 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 5.10.1 - 5.8.0 + 5.9.0 2.6.8 From 175affdc3bde446b9eed6654bc2651d0ecfa7815 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:04:42 +0000 Subject: [PATCH 13/30] Bump the maven-build-plugins group with 2 updates (#105) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 29c0a53..347dfda 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 2.6.8 - 9.0.7 + 9.0.9 3.1.1 0.8.11 @@ -192,7 +192,7 @@ maven-surefire-plugin - 3.2.3 + 3.2.5 @{surefire.jacoco.args} -javaagent:${net.bytebuddy:byte-buddy-agent:jar} --enable-preview --enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.cryptomator.jfuse.mac,org.cryptomator.jfuse.win From 1747517da725cc52fc64b5af962b04b7f30987a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:06:01 +0000 Subject: [PATCH 14/30] Bump the java-production-dependencies group with 2 updates (#103) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 347dfda..ffe683c 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 1.3.0 0.6.3 - 2.0.9 + 2.0.11 3.1.8 From 566c319eef53f3986f09beeb8c0444a8f1aa8ac7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 09:08:02 +0000 Subject: [PATCH 15/30] Bump the java-test-dependencies group with 1 update (#106) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ffe683c..5e42066 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 5.10.1 - 5.9.0 + 5.10.0 2.6.8 From 3861b62416f48901fc7fdba2c5937c01deac37fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 09:11:39 +0000 Subject: [PATCH 16/30] Bump the github-actions group with 1 update (#107) --- .github/workflows/dependency-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index a153b18..e0f2782 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -23,7 +23,7 @@ jobs: java-version: 21 cache: 'maven' - name: Cache NVD DB - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository/org/owasp/dependency-check-data/ key: dependency-check-${{ github.run_id }} From d1d9f9d597bceaee0d16456b651ec87d4b8df7e9 Mon Sep 17 00:00:00 2001 From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com> Date: Thu, 1 Feb 2024 19:12:16 +0100 Subject: [PATCH 17/30] Externalized dependency-check --- .github/workflows/dependency-check.yml | 59 ++++---------------------- 1 file changed, 8 insertions(+), 51 deletions(-) diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index e0f2782..dcb635a 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -10,54 +10,11 @@ on: jobs: check-dependencies: - name: Check dependencies - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - show-progress: false - - name: Setup Java - uses: actions/setup-java@v4 - with: - distribution: 'zulu' - java-version: 21 - cache: 'maven' - - name: Cache NVD DB - uses: actions/cache@v4 - with: - path: ~/.m2/repository/org/owasp/dependency-check-data/ - key: dependency-check-${{ github.run_id }} - restore-keys: | - dependency-check - env: - SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5 - - name: Run org.owasp:dependency-check plugin - id: dependency-check - continue-on-error: true - run: mvn -B validate -Pdependency-check - env: - NVD_API_KEY: ${{ secrets.NVD_API_KEY }} - - name: Upload report on failure - if: steps.dependency-check.outcome == 'failure' - uses: actions/upload-artifact@v4 - with: - name: dependency-check-report - path: target/dependency-check-report.html - if-no-files-found: error - - name: Slack Notification on regular check - if: github.event_name == 'schedule' && steps.dependency-check.outcome == 'failure' - uses: rtCamp/action-slack-notify@v2 - env: - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} - SLACK_USERNAME: 'Cryptobot' - SLACK_ICON: false - SLACK_ICON_EMOJI: ':bot:' - SLACK_CHANNEL: 'cryptomator-desktop' - SLACK_TITLE: "Vulnerabilities in ${{ github.event.repository.name }} detected." - SLACK_MESSAGE: "Download the for more details." - SLACK_FOOTER: false - MSG_MINIMAL: true - - name: Failing workflow on release branch - if: github.event_name == 'push' && steps.dependency-check.outcome == 'failure' - shell: bash - run: exit 1 + uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@v1 + with: + runner-os: 'ubuntu-latest' + java-distribution: 'zulu' + java-version: 21 + secrets: + nvd-api-key: ${{ secrets.NVD_API_KEY }} + slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }} From e0454191d8f83ff631bbb0ea51e0c43d182b8c24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 09:51:34 +0000 Subject: [PATCH 18/30] Bump the java-production-dependencies group with 3 updates (#112) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5e42066..e02891f 100644 --- a/pom.xml +++ b/pom.xml @@ -20,9 +20,9 @@ 21 - 1.3.0 + 1.3.1 0.6.3 - 2.0.11 + 2.0.12 3.1.8 From 675cfeb8c68ee39d0a37700fa3deb9fef0d958cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:19:35 +0000 Subject: [PATCH 19/30] Bump the java-test-dependencies group with 5 updates (#113) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e02891f..dbf2bf3 100644 --- a/pom.xml +++ b/pom.xml @@ -26,9 +26,9 @@ 3.1.8 - 5.10.1 - 5.10.0 - 2.6.8 + 5.10.2 + 5.11.0 + 2.6.9 9.0.9 From f4cb50b96d06a6838a4d7480a8aa646cffec3b41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 08:45:42 +0000 Subject: [PATCH 20/30] Bump the maven-build-plugins group with 3 updates (#116) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index dbf2bf3..1056dfc 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 2.6.9 - 9.0.9 + 9.0.10 3.1.1 0.8.11 @@ -152,7 +152,7 @@ maven-compiler-plugin - 3.12.1 + 3.13.0 true ${project.build.jdk} @@ -295,7 +295,7 @@ maven-gpg-plugin - 3.1.0 + 3.2.1 sign-artifacts From 7639359f65a1f07c3b2eb856f0ef2585cb3cbb99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 08:08:30 +0000 Subject: [PATCH 21/30] Bump the github-actions group with 1 update (#117) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c1e171..a7a3777 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: name: artifacts path: target/*.jar - name: Create Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 if: startsWith(github.ref, 'refs/tags/') with: prerelease: true From e230001e7d15430cdedcf4f734406d37a79000f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 08:48:56 +0000 Subject: [PATCH 22/30] Bump the maven-build-plugins group with 4 updates (#119) --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1056dfc..e856be0 100644 --- a/pom.xml +++ b/pom.xml @@ -31,9 +31,9 @@ 2.6.9 - 9.0.10 + 9.1.0 3.1.1 - 0.8.11 + 0.8.12 @@ -204,7 +204,7 @@ maven-source-plugin - 3.3.0 + 3.3.1 attach-sources @@ -295,7 +295,7 @@ maven-gpg-plugin - 3.2.1 + 3.2.2 sign-artifacts From f80f08ad8cae319b143b6fc2c14c86ea083bea03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 09:04:18 +0000 Subject: [PATCH 23/30] Bump the maven-build-plugins group with 2 updates (#121) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e856be0..a5708b0 100644 --- a/pom.xml +++ b/pom.xml @@ -200,7 +200,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.0 maven-source-plugin @@ -295,7 +295,7 @@ maven-gpg-plugin - 3.2.2 + 3.2.3 sign-artifacts From 44fe2bd811dcbaa3297baca914388af16b293793 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 17 Apr 2024 11:05:05 +0200 Subject: [PATCH 24/30] Bump slf4j from 2.0.12 to 2.0.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a5708b0..78bcd91 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 1.3.1 0.6.3 - 2.0.12 + 2.0.13 3.1.8 From b572c7d356b273a35a1bd70fadb2d735c888b227 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 17 Apr 2024 11:42:44 +0200 Subject: [PATCH 25/30] update JDK from 21 to 22 --- .github/workflows/build.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/dependency-check.yml | 2 +- .github/workflows/publish-central.yml | 2 +- .github/workflows/publish-github.yml | 2 +- .idea/misc.xml | 2 +- pom.xml | 9 +++------ 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a7a3777..ed68fbf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 22 distribution: 'zulu' cache: 'maven' - name: Ensure to use tagged version diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 7cdc153..4a72a3c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -20,7 +20,7 @@ jobs: fetch-depth: 2 - uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 22 distribution: 'zulu' cache: 'maven' - name: Initialize CodeQL diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index dcb635a..85c0490 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -14,7 +14,7 @@ jobs: with: runner-os: 'ubuntu-latest' java-distribution: 'zulu' - java-version: 21 + java-version: 22 secrets: nvd-api-key: ${{ secrets.NVD_API_KEY }} slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }} diff --git a/.github/workflows/publish-central.yml b/.github/workflows/publish-central.yml index d4c8e14..68de332 100644 --- 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@v4 with: - java-version: 21 + java-version: 22 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 index 5b9df1c..0ab2eec 100644 --- a/.github/workflows/publish-github.yml +++ b/.github/workflows/publish-github.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 22 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 index 7fb4876..ea62868 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,5 +8,5 @@ - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 78bcd91..008c059 100644 --- a/pom.xml +++ b/pom.xml @@ -17,11 +17,11 @@ UTF-8 - 21 + 22 1.3.1 - 0.6.3 + 0.7.0 2.0.13 3.1.8 @@ -156,9 +156,6 @@ true ${project.build.jdk} - - --enable-preview - @@ -194,7 +191,7 @@ maven-surefire-plugin 3.2.5 - @{surefire.jacoco.args} -javaagent:${net.bytebuddy:byte-buddy-agent:jar} --enable-preview --enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.cryptomator.jfuse.mac,org.cryptomator.jfuse.win + @{surefire.jacoco.args} -javaagent:${net.bytebuddy:byte-buddy-agent:jar} From 6d1d2c92034e76728e649405d9eb809c29b4d899 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 17 Apr 2024 11:43:03 +0200 Subject: [PATCH 26/30] apply unnamed variable pattern --- .../frontend/fuse/ReadOnlyAdapter.java | 16 +++++++------- .../frontend/fuse/ReadWriteAdapter.java | 22 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/cryptomator/frontend/fuse/ReadOnlyAdapter.java b/src/main/java/org/cryptomator/frontend/fuse/ReadOnlyAdapter.java index 49c3248..ddeb7d4 100644 --- a/src/main/java/org/cryptomator/frontend/fuse/ReadOnlyAdapter.java +++ b/src/main/java/org/cryptomator/frontend/fuse/ReadOnlyAdapter.java @@ -182,7 +182,7 @@ protected int checkAccess(Path path, Set requiredAccessModes, Set requiredAccessModes) { @Override public int mkdir(String path, int mode) { try (PathLock pathLock = lockManager.lockForWriting(path); - DataLock dataLock = pathLock.lockDataForWriting()) { + DataLock _ = pathLock.lockDataForWriting()) { Path node = resolvePath(fileNameTranscoder.fuseToNio(path)); LOG.trace("mkdir {} ({})", path, mode); Files.createDirectory(node); @@ -105,7 +105,7 @@ public int mkdir(String path, int mode) { @Override public int removexattr(String path, String name) { try (PathLock pathLock = lockManager.lockForReading(path); - DataLock dataLock = pathLock.lockDataForWriting()) { + DataLock _ = pathLock.lockDataForWriting()) { Path node = resolvePath(path); LOG.trace("removexattr {} {}", path, name); var xattr = Files.getFileAttributeView(node, UserDefinedFileAttributeView.class, LinkOption.NOFOLLOW_LINKS); @@ -124,7 +124,7 @@ public int removexattr(String path, String name) { @Override public int setxattr(String path, String name, ByteBuffer value, int flags) { try (PathLock pathLock = lockManager.lockForReading(path); - DataLock dataLock = pathLock.lockDataForWriting()) { + DataLock _ = pathLock.lockDataForWriting()) { Path node = resolvePath(path); LOG.trace("setxattr {} {}", path, name); var xattr = Files.getFileAttributeView(node, UserDefinedFileAttributeView.class, LinkOption.NOFOLLOW_LINKS); @@ -143,7 +143,7 @@ public int setxattr(String path, String name, ByteBuffer value, int flags) { @Override public int symlink(String targetPath, String linkPath) { try (PathLock pathLock = lockManager.lockForWriting(linkPath); - DataLock dataLock = pathLock.lockDataForWriting()) { + DataLock _ = pathLock.lockDataForWriting()) { Path link = resolvePath(fileNameTranscoder.fuseToNio(linkPath)); Path target = link.getFileSystem().getPath(fileNameTranscoder.fuseToNio(targetPath)); LOG.trace("symlink {} -> {}", linkPath, targetPath); @@ -163,7 +163,7 @@ public int symlink(String targetPath, String linkPath) { @Override public int create(String path, int mode, FileInfo fi) { try (PathLock pathLock = lockManager.lockForWriting(path); - DataLock dataLock = pathLock.lockDataForWriting()) { + DataLock _ = pathLock.lockDataForWriting()) { Path node = resolvePath(fileNameTranscoder.fuseToNio(path)); var flags = fi.getOpenFlags(); LOG.trace("create {} with flags {}", path, flags); @@ -194,7 +194,7 @@ public int chown(String path, int uid, int gid, FileInfo fi) { @Override public int chmod(String path, int mode, FileInfo fi) { try (PathLock pathLock = lockManager.lockForReading(path); - DataLock dataLock = pathLock.lockDataForWriting()) { + DataLock _ = pathLock.lockDataForWriting()) { Path node = resolvePath(fileNameTranscoder.fuseToNio(path)); LOG.trace("chmod {} ({})", path, mode); Files.setPosixFilePermissions(node, FileAttributesUtil.octalModeToPosixPermissions(mode)); @@ -216,7 +216,7 @@ public int chmod(String path, int mode, FileInfo fi) { @Override public int unlink(String path) { try (PathLock pathLock = lockManager.lockForWriting(path); - DataLock dataLock = pathLock.lockDataForWriting()) { + DataLock _ = pathLock.lockDataForWriting()) { Path node = resolvePath(fileNameTranscoder.fuseToNio(path)); if (Files.isDirectory(node, LinkOption.NOFOLLOW_LINKS)) { LOG.warn("unlink {} failed, node is a directory.", path); @@ -237,7 +237,7 @@ public int unlink(String path) { @Override public int rmdir(String path) { try (PathLock pathLock = lockManager.lockForWriting(path); - DataLock dataLock = pathLock.lockDataForWriting()) { + DataLock _ = pathLock.lockDataForWriting()) { Path node = resolvePath(fileNameTranscoder.fuseToNio(path)); if (!Files.isDirectory(node, LinkOption.NOFOLLOW_LINKS)) { throw new NotDirectoryException(path); @@ -306,7 +306,7 @@ public int rename(String oldPath, String newPath, int flags) { @Override public int utimens(String path, TimeSpec atime, TimeSpec mtime, FileInfo fi) { try (PathLock pathLock = lockManager.lockForReading(path); - DataLock dataLock = pathLock.lockDataForWriting()) { + DataLock _ = pathLock.lockDataForWriting()) { Path node = resolvePath(fileNameTranscoder.fuseToNio(path)); LOG.trace("utimens {} (last modification {}, last access {})", path, mtime, atime); fileHandler.utimens(node, mtime, atime); @@ -323,7 +323,7 @@ public int utimens(String path, TimeSpec atime, TimeSpec mtime, FileInfo fi) { @Override public int write(String path, ByteBuffer buf, long size, long offset, FileInfo fi) { try (PathLock pathLock = lockManager.lockForReading(path); - DataLock dataLock = pathLock.lockDataForWriting()) { + DataLock _ = pathLock.lockDataForWriting()) { LOG.trace("write {} bytes to file {} starting at {}...", size, path, offset); int written = fileHandler.write(buf, size, offset, fi); LOG.trace("wrote {} bytes to file {}.", written, path); @@ -340,7 +340,7 @@ public int write(String path, ByteBuffer buf, long size, long offset, FileInfo f @Override public int truncate(String path, long size, FileInfo fi) { try (PathLock pathLock = lockManager.lockForReading(path); - DataLock dataLock = pathLock.lockDataForWriting()) { + DataLock _ = pathLock.lockDataForWriting()) { Path node = resolvePath(fileNameTranscoder.fuseToNio(path)); LOG.trace("truncate {} {}", path, size); if (fi != null) { From 843cb154ce14e2b6390e162467d3929afa1d9983 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 17 Apr 2024 11:47:29 +0200 Subject: [PATCH 27/30] adjust IDE run config --- .idea/runConfigurations/Mirror.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.idea/runConfigurations/Mirror.xml b/.idea/runConfigurations/Mirror.xml index f705a84..e07961a 100644 --- a/.idea/runConfigurations/Mirror.xml +++ b/.idea/runConfigurations/Mirror.xml @@ -2,7 +2,7 @@ From eb68b2ed807dabf250b228149536d8ed4282d214 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 08:27:32 +0000 Subject: [PATCH 29/30] Bump the maven-build-plugins group with 2 updates (#123) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 793c08d..682d202 100644 --- a/pom.xml +++ b/pom.xml @@ -197,7 +197,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.0 + 3.4.1 maven-source-plugin @@ -292,7 +292,7 @@ maven-gpg-plugin - 3.2.3 + 3.2.4 sign-artifacts From b8b451dfa5bcbf6c3c9b0e15c7a394ae5ee70687 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 24 Apr 2024 12:59:58 +0200 Subject: [PATCH 30/30] prepare 5.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 682d202..b874136 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.cryptomator fuse-nio-adapter - 4.1.0-SNAPSHOT + 5.0.0 FUSE-NIO-Adapter Access resources at a given NIO path via FUSE. https://github.com/cryptomator/fuse-nio-adapter