Skip to content

Commit ea24cea

Browse files
committed
Merge branch 'release/1.2.4'
2 parents 18d22df + 610ec7d commit ea24cea

File tree

6 files changed

+7
-4
lines changed

6 files changed

+7
-4
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ defaults:
1616
jobs:
1717
analyse:
1818
name: Analyse
19-
runs-on: windows-2019
19+
runs-on: windows-latest
2020
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
2121
steps:
2222
- uses: actions/checkout@v4

pom.xml

Lines changed: 3 additions & 3 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.2.3</version>
8+
<version>1.2.4</version>
99

1010
<name>Cryptomator Integrations for Windows</name>
1111
<description>Provides optional Windows services used by Cryptomator</description>
@@ -39,11 +39,11 @@
3939
<!-- runtime dependencies -->
4040
<api.version>1.3.0</api.version>
4141
<slf4j.version>2.0.9</slf4j.version>
42-
<jackson.version>2.15.2</jackson.version>
42+
<jackson.version>2.15.3</jackson.version>
4343

4444
<!-- test dependencies -->
4545
<junit.jupiter.version>5.10.0</junit.jupiter.version>
46-
<mockito.version>5.5.0</mockito.version>
46+
<mockito.version>5.6.0</mockito.version>
4747

4848
<!-- build plugin dependencies -->
4949
<dependency-check.version>8.4.0</dependency-check.version>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.cryptomator.windows.keychain.displayName=Ахова даных на Windows
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.cryptomator.windows.keychain.displayName=Windows Data Protection

src/main/resources/WinIntegrationsBundle_fi.properties

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.cryptomator.windows.keychain.displayName=Windows Data Protection

0 commit comments

Comments
 (0)