Skip to content

Commit 4a5798e

Browse files
committed
Merge branch 'release/1.6.1'
2 parents 1a4c613 + 0b0cfe0 commit 4a5798e

10 files changed

Lines changed: 54 additions & 64 deletions

.github/dependabot.yml

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,12 @@ updates:
1010
ignore:
1111
- dependency-name: "org.apache.maven.plugins:maven-surefire-plugin"
1212
versions: [ "3.5.4" ] # incompatible with junit-tree reporter
13+
- dependency-name: "com.fasterxml.jackson.*"
14+
versions: [ "[2.22,)" ] # 2.21.x is LTS, see https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.21
1315
groups:
14-
java-test-dependencies:
15-
patterns:
16-
- "org.junit.jupiter:*"
17-
- "org.mockito:*"
18-
maven-build-plugins:
19-
patterns:
20-
- "org.apache.maven.plugins:*"
21-
- "org.owasp:dependency-check-maven"
22-
- "org.sonatype.central:central-publishing-maven-plugin"
23-
- "me.fabriciorby:maven-surefire-junit5-tree-reporter"
24-
- "org.codehaus.mojo:exec-maven-plugin"
25-
- "io.github.coffeelibs:jextract-maven-plugin"
26-
java-production-dependencies:
16+
java-dependencies:
2717
patterns:
2818
- "*"
29-
exclude-patterns:
30-
- "org.junit.jupiter:*"
31-
- "org.mockito:*"
32-
- "org.apache.maven.plugins:*"
33-
- "org.owasp:dependency-check-maven"
34-
- "org.sonatype.central:central-publishing-maven-plugin"
35-
- "me.fabriciorby:maven-surefire-junit5-tree-reporter"
36-
- "org.codehaus.mojo:exec-maven-plugin"
37-
- "io.github.coffeelibs:jextract-maven-plugin"
3819
- package-ecosystem: "github-actions"
3920
directory: "/" # even for `.github/workflows`
4021
schedule:

.github/workflows/build.yml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
name: Build
22
on:
33
push:
4-
pull_request_target:
5-
types: [labeled]
4+
pull_request:
65

76
env:
87
JAVA_VERSION: 25
@@ -14,18 +13,18 @@ defaults:
1413
jobs:
1514
build:
1615
name: Build and Test
17-
runs-on: windows-latest
16+
runs-on: windows-2022
1817
permissions:
1918
contents: read
2019
id-token: write # OIDC token for the attestations step
2120
attestations: write # Required for the attestations step
2221
outputs:
2322
sha256: ${{ steps.checksums.outputs.sha256 }}
2423
steps:
25-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
24+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2625
with:
2726
fetch-depth: 0 # deep fetch for better sonarcloud analysis
28-
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
27+
- uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
2928
with:
3029
distribution: 'temurin'
3130
java-version: ${{ env.JAVA_VERSION }}
@@ -37,7 +36,7 @@ jobs:
3736
run: ./mvnw -B test --no-transfer-progress -DdevCommandFileDir="${{ vars.MSVC_DEV_FILES_DIR }}"
3837
- name: Sign DLLs with Azure Trusted Signing
3938
if: startsWith(github.ref, 'refs/tags/')
40-
uses: azure/artifact-signing-action@db7a3a6bd3912025c705162fb7475389f5b69ec6 # v1.0.0
39+
uses: azure/artifact-signing-action@c7ab2a863ab5f9a846ddb8265964877ef296ee82 # v2.0.0
4140
with:
4241
files: |
4342
${{ github.workspace }}\src\main\resources\integrations-x64.dll
@@ -79,27 +78,27 @@ jobs:
7978
"@ | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
8079
- name: Attest
8180
if: startsWith(github.ref, 'refs/tags/')
82-
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0
81+
uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
8382
with:
8483
subject-path: |
8584
target/*.jar
8685
target/*.pom
87-
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
86+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
8887
with:
8988
name: artifacts
9089
path: target/*.jar
9190

9291
deploy-central:
9392
name: Deploy to Maven Central
94-
runs-on: windows-latest
93+
runs-on: windows-2022
9594
permissions:
9695
id-token: write # OIDC token for sigstore signing
9796
contents: read # Required for sigstore signing
9897
needs: [build]
9998
if: github.repository_owner == 'cryptomator' && (startsWith(github.ref, 'refs/tags/') || contains(github.event.head_commit.message, '[deploy]'))
10099
steps:
101-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
102-
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
100+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
101+
- uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
103102
with:
104103
distribution: 'temurin'
105104
java-version: ${{ env.JAVA_VERSION }}
@@ -116,10 +115,10 @@ jobs:
116115
PROJECT_VERSION=$(./mvnw help:evaluate "-Dexpression=project.version" -q -DforceStdout)
117116
test "${PROJECT_VERSION: -9}" = "-SNAPSHOT"
118117
- name: Download JAR with signed DLLs
119-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
118+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
120119
with:
121120
name: artifacts
122-
- name: Extract DLLs from JAR
121+
- name: Extract singed DLLs from JAR into src dir, skipping native compile
123122
run: |
124123
JAR_PATH=$(ls ./*.jar | grep -v -E '(-sources|-javadoc)\.jar$' | head -n1)
125124
jar --extract --file="$JAR_PATH" --dir ./src/main/resources integrations-x64.dll integrations-arm64.dll
@@ -134,16 +133,16 @@ jobs:
134133

135134
deploy-github:
136135
name: Deploy to GitHub Packages
137-
runs-on: windows-latest
136+
runs-on: windows-2022
138137
permissions:
139138
packages: write # Required for the deploy to GitHub Packages step
140139
id-token: write # OIDC token for sigstore signing
141140
contents: read # Required for sigstore signing
142141
needs: [build]
143142
if: github.repository_owner == 'cryptomator' && (startsWith(github.ref, 'refs/tags/') || contains(github.event.head_commit.message, '[deploy]'))
144143
steps:
145-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
146-
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
144+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
145+
- uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
147146
with:
148147
java-version: ${{ env.JAVA_VERSION }}
149148
distribution: 'temurin'
@@ -157,10 +156,10 @@ jobs:
157156
PROJECT_VERSION=$(./mvnw help:evaluate "-Dexpression=project.version" -q -DforceStdout)
158157
test "${PROJECT_VERSION: -9}" = "-SNAPSHOT"
159158
- name: Download JAR with signed DLLs
160-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
159+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
161160
with:
162161
name: artifacts
163-
- name: Extract DLLs from JAR
162+
- name: Extract singed DLLs from JAR into src dir, skipping native compile
164163
run: |
165164
JAR_PATH=$(ls ./*.jar | grep -v -E '(-sources|-javadoc)\.jar$' | head -n1)
166165
jar --extract --file="$JAR_PATH" --dir ./src/main/resources integrations-x64.dll integrations-arm64.dll
@@ -181,7 +180,7 @@ jobs:
181180
if: startsWith(github.ref, 'refs/tags/')
182181
steps:
183182
- name: Create Release
184-
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
183+
uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
185184
with:
186185
prerelease: true
187186
token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}

.github/workflows/codeql-analysis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ env:
2020
jobs:
2121
analyse:
2222
name: Analyse
23-
runs-on: windows-latest
23+
runs-on: windows-2022
2424
if: ${{ !(github.actor == 'dependabot[bot]' && contains(fromJSON('["push"]'), github.event_name)) }}
2525
steps:
26-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
26+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2727
with:
2828
fetch-depth: 2
29-
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
29+
- uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
3030
with:
3131
distribution: 'temurin'
3232
java-version: ${{ env.JAVA_VERSION }}
3333
cache: 'maven'
3434
- name: Initialize CodeQL
35-
uses: github/codeql-action/init@6bc82e05fd0ea64601dd4b465378bbcf57de0314 # v4.32.1
35+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
3636
with:
3737
languages: java
3838
- name: Build
3939
run: ./mvnw -B compile -DskipTests -DdevCommandFileDir="${{ env.MSVC_DEV_FILES_DIR }}"
4040
- name: Perform CodeQL Analysis
41-
uses: github/codeql-action/analyze@6bc82e05fd0ea64601dd4b465378bbcf57de0314 # v4.32.1
41+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2

.github/workflows/dependency-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ on:
1010

1111
jobs:
1212
check-dependencies:
13-
uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@957d3c2c08c56855fdac41e5afb9a7aca8c30dd9 # v3.0.3
13+
uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@8356563bf7b8d1c8d693f75ca487e8f57573cec9 # v3.1.0
1414
with:
15-
runner-os: 'windows-latest'
15+
runner-os: 'windows-2022'
1616
java-distribution: 'temurin'
1717
java-version: 25
1818
secrets:

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
77
The changelog starts with version 1.5.1.
88
Changes to prior versions can be found on the [GitHub release page](https://github.com/cryptomator/integrations-win/releases).
99

10+
## [1.6.1](https://github.com/cryptomator/integrations-win/releases/1.6.1) - 2026-06-22
11+
### Changed
12+
* Update dependencies
13+
- `org.cryptomator:integrations-api` from 1.7.0 to 1.9.0
14+
- `com.fasterxml.jackson.core:jackson-databind` from 2.21.0 to 2.21.4
15+
- `org.slf4j:slf4j-*` from 2.0.17 to 2.0.18
16+
17+
1018
## [1.6.0](https://github.com/cryptomator/integrations-win/releases/1.6.0) - 2026-02-17
1119
### Added
1220
* Maven wrapper ([#131](https://github.com/cryptomator/integrations-win/pull/131))

pom.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>integrations-win</artifactId>
8-
<version>1.6.0</version>
8+
<version>1.6.1</version>
99

1010
<name>Cryptomator Integrations for Windows</name>
1111
<description>Provides optional Windows services used by Cryptomator</description>
@@ -37,30 +37,30 @@
3737
<project.jdk.version>25</project.jdk.version>
3838

3939
<!-- runtime dependencies -->
40-
<api.version>1.7.0</api.version>
41-
<slf4j.version>2.0.17</slf4j.version>
42-
<jackson.version>2.21.0</jackson.version>
40+
<api.version>1.9.0</api.version>
41+
<slf4j.version>2.0.18</slf4j.version>
42+
<jackson.version>2.21.4</jackson.version>
4343
<jackson-annotations.version>2.21</jackson-annotations.version>
4444

4545
<!-- test dependencies -->
46-
<junit.jupiter.version>6.0.2</junit.jupiter.version>
47-
<mockito.version>5.21.0</mockito.version>
46+
<junit.jupiter.version>6.1.0</junit.jupiter.version>
47+
<mockito.version>5.23.0</mockito.version>
4848

4949
<!-- build plugin dependencies -->
5050
<mvn-clean.version>3.5.0</mvn-clean.version>
5151
<mvn-compiler.version>3.15.0</mvn-compiler.version>
52-
<mvn-dependency.version>3.9.0</mvn-dependency.version>
52+
<mvn-dependency.version>3.11.0</mvn-dependency.version>
5353
<mvn-deploy.version>3.1.4</mvn-deploy.version>
54-
<mvn-enforcer.version>3.6.2</mvn-enforcer.version>
55-
<mvn-failsafe.version>3.5.4</mvn-failsafe.version>
54+
<mvn-enforcer.version>3.6.3</mvn-enforcer.version>
55+
<mvn-failsafe.version>3.5.6</mvn-failsafe.version>
5656
<mvn-javadoc.version>3.12.0</mvn-javadoc.version>
5757
<mvn-gpg.version>3.2.8</mvn-gpg.version>
58-
<mvn-resources.version>3.4.0</mvn-resources.version>
58+
<mvn-resources.version>3.5.0</mvn-resources.version>
5959
<mvn-source.version>3.4.0</mvn-source.version>
60-
<mvn-surefire.version>3.5.3</mvn-surefire.version> <!-- Update blocked by https://github.com/fabriciorby/maven-surefire-junit5-tree-reporter/issues/68 . Check also dependabot file -->
60+
<mvn-surefire.version>3.5.6</mvn-surefire.version> <!-- Update blocked by https://github.com/fabriciorby/maven-surefire-junit5-tree-reporter/issues/68 . Check also dependabot file -->
6161
<exec-maven.version>3.6.3</exec-maven.version>
62-
<dependency-check.version>12.2.0</dependency-check.version>
63-
<central-publishing.version>0.10.0</central-publishing.version>
62+
<dependency-check.version>12.2.2</dependency-check.version>
63+
<central-publishing.version>0.11.0</central-publishing.version>
6464
<jextract-maven.version>0.4.4</jextract-maven.version>
6565
<junit-tree-reporter.version>1.5.1</junit-tree-reporter.version>
6666

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
org.cryptomator.windows.keychain.displayName=Windows adatvédelem
1+
org.cryptomator.windows.keychain.displayName=Windows adatvédelem
2+
org.cryptomator.windows.keychain.displayWindowsHelloName=Windows Hello

src/main/resources/WinIntegrationsBundle_lt.properties

Whitespace-only changes.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
org.cryptomator.windows.keychain.displayName=Windows 數據保護
1+
org.cryptomator.windows.keychain.displayName=Windows 數據保護
2+
org.cryptomator.windows.keychain.displayWindowsHelloName=Windows Hello
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
org.cryptomator.windows.keychain.displayName=Windows 數據保護
1+
org.cryptomator.windows.keychain.displayName=Windows 資料保護
22
org.cryptomator.windows.keychain.displayWindowsHelloName=Windows Hello

0 commit comments

Comments
 (0)