Skip to content

Commit 60e3520

Browse files
committed
Merge branch 'release/1.5.1'
2 parents 23dcf6a + eb1c40c commit 60e3520

File tree

8 files changed

+70
-38
lines changed

8 files changed

+70
-38
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ updates:
1616
patterns:
1717
- "org.apache.maven.plugins:*"
1818
- "org.owasp:dependency-check-maven"
19-
- "org.sonatype.plugins:nexus-staging-maven-plugin"
19+
- "org.sonatype.central:central-publishing-maven-plugin"
20+
- "me.fabriciorby:maven-surefire-junit5-tree-reporter"
2021
- "org.codehaus.mojo:exec-maven-plugin"
2122
- "io.github.coffeelibs:jextract-maven-plugin"
2223
java-production-dependencies:
@@ -27,7 +28,8 @@ updates:
2728
- "org.mockito:*"
2829
- "org.apache.maven.plugins:*"
2930
- "org.owasp:dependency-check-maven"
30-
- "org.sonatype.plugins:nexus-staging-maven-plugin"
31+
- "org.sonatype.central:central-publishing-maven-plugin"
32+
- "me.fabriciorby:maven-surefire-junit5-tree-reporter"
3133
- "org.codehaus.mojo:exec-maven-plugin"
3234
- "io.github.coffeelibs:jextract-maven-plugin"
3335
- package-ecosystem: "github-actions"

.github/workflows/build.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
name: Build and Test
1414
runs-on: windows-latest
1515
steps:
16-
- uses: actions/checkout@v4
17-
- uses: actions/setup-java@v4
16+
- uses: actions/checkout@v5
17+
- uses: actions/setup-java@v5
1818
with:
1919
distribution: 'temurin'
2020
java-version: 24
@@ -28,13 +28,14 @@ jobs:
2828
run: mvn -B clean test -DdevCommandFileDir="${{ vars.MSVC_DEV_FILES_DIR }}"
2929
- name: Codesign DLL on release
3030
if: startsWith(github.ref, 'refs/tags/')
31-
uses: skymatic/code-sign-action@v3
31+
uses: skymatic/workflows/.github/actions/win-sign-action@450e322ff2214d0be0b079b63343c894f3ef735f
3232
with:
33-
certificate: ${{ secrets.WIN_CODESIGN_P12_BASE64 }}
34-
password: ${{ secrets.WIN_CODESIGN_P12_PW }}
35-
certificatesha1: 5FC94CE149E5B511E621F53A060AC67CBD446B3A
36-
timestampUrl: 'http://timestamp.digicert.com'
37-
folder: ./src/main/resources
33+
base-dir: src/main/resources
34+
file-extensions: dll
35+
username: ${{ secrets.WIN_CODESIGN_USERNAME }}
36+
password: ${{ secrets.WIN_CODESIGN_PW }}
37+
sign-description: 'Cryptomator'
38+
sign-url: 'https://cryptomator.org'
3839
- name: Package and Install
3940
id: packAndInstall
4041
run: mvn -B install -DskipNativeCompile
@@ -49,3 +50,5 @@ jobs:
4950
prerelease: true
5051
token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
5152
generate_release_notes: true
53+
body: |
54+
For a list of all notable changes, read the [changelog](/CHANGELOG.md).

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
runs-on: windows-latest
2323
if: ${{ !(github.actor == 'dependabot[bot]' && contains(fromJSON('["push"]'), github.event_name)) }}
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
with:
2727
fetch-depth: 2
28-
- uses: actions/setup-java@v4
28+
- uses: actions/setup-java@v5
2929
with:
3030
distribution: 'temurin'
3131
java-version: 24

.github/workflows/publish-central.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
runs-on: windows-latest
1313
if: startsWith(github.ref, 'refs/tags/') # only allow publishing tagged versions
1414
steps:
15-
- uses: actions/checkout@v4
16-
- uses: actions/setup-java@v4
15+
- uses: actions/checkout@v5
16+
- uses: actions/setup-java@v5
1717
with:
1818
distribution: 'temurin'
1919
java-version: 24

.github/workflows/publish-github.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
runs-on: windows-latest
1313
if: startsWith(github.ref, 'refs/tags/') # only allow publishing tagged versions
1414
steps:
15-
- uses: actions/checkout@v4
16-
- uses: actions/setup-java@v4
15+
- uses: actions/checkout@v5
16+
- uses: actions/setup-java@v5
1717
with:
1818
distribution: 'temurin'
1919
java-version: 24

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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+
7+
The changelog starts with version 1.5.1.
8+
Changes to prior versions can be found on the [Github release page](https://github.com/cryptomator/integrations-win/releases).
9+
10+
## [1.5.1] - 2025-09-17
11+
12+
* Update `com.fasterxml.jackson.core:jackson-databind` from 2.19.0 to 2.20.0
13+
* Update `com.fasterxml.jackson.core:jackson-annotations` from 2.19.0 to 2.20
14+
* Update `org.cryptomator:integrations-api` from 1.6.0 to 1.7.0
15+

pom.xml

Lines changed: 33 additions & 21 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.5.0</version>
8+
<version>1.5.1</version>
99

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

3939
<!-- runtime dependencies -->
40-
<api.version>1.6.0</api.version>
40+
<api.version>1.7.0</api.version>
4141
<slf4j.version>2.0.17</slf4j.version>
42-
<jackson.version>2.19.0</jackson.version>
42+
<jackson.version>2.20.0</jackson.version>
43+
<jackson-annotations.version>2.20</jackson-annotations.version>
4344

4445
<!-- test dependencies -->
45-
<junit.jupiter.version>5.12.2</junit.jupiter.version>
46-
<mockito.version>5.17.0</mockito.version>
46+
<junit.jupiter.version>5.13.4</junit.jupiter.version>
47+
<mockito.version>5.19.0</mockito.version>
4748

4849
<!-- build plugin dependencies -->
49-
<mvn-surefire.version>3.5.3</mvn-surefire.version>
50-
<mvn-failsafe.version>3.5.3</mvn-failsafe.version>
51-
<dependency-check.version>12.1.1</dependency-check.version>
52-
<central-publishing.version>0.7.0</central-publishing.version>
50+
<mvn-clean.version>3.5.0</mvn-clean.version>
51+
<mvn-compiler.version>3.14.0</mvn-compiler.version>
52+
<mvn-dependency.version>3.8.1</mvn-dependency.version>
53+
<mvn-deploy.version>3.1.4</mvn-deploy.version>
54+
<mvn-enforcer.version>3.6.1</mvn-enforcer.version>
55+
<mvn-failsafe.version>3.5.4</mvn-failsafe.version>
56+
<mvn-javadoc.version>3.11.3</mvn-javadoc.version>
57+
<mvn-gpg.version>3.2.8</mvn-gpg.version>
58+
<mvn-resources.version>3.3.1</mvn-resources.version>
59+
<mvn-source.version>3.3.1</mvn-source.version>
60+
<mvn-surefire.version>3.5.4</mvn-surefire.version>
61+
<exec-maven.version>3.5.1</exec-maven.version>
62+
<dependency-check.version>12.1.3</dependency-check.version>
63+
<central-publishing.version>0.8.0</central-publishing.version>
5364
<jextract-maven.version>0.4.3</jextract-maven.version>
65+
<junit-tree-reporter.version>1.4.0</junit-tree-reporter.version>
5466

5567
<!-- jextract props -->
5668
<win.umHeaderPath>C:\Program Files (x86)\Windows Kits\10\Include\10.0.22621.0\um</win.umHeaderPath>
@@ -84,7 +96,7 @@
8496
<dependency>
8597
<groupId>com.fasterxml.jackson.core</groupId>
8698
<artifactId>jackson-annotations</artifactId>
87-
<version>${jackson.version}</version>
99+
<version>${jackson-annotations.version}</version>
88100
</dependency>
89101

90102
<!-- JUnit / Mockito / Hamcrest -->
@@ -113,7 +125,7 @@
113125
<plugin>
114126
<groupId>org.apache.maven.plugins</groupId>
115127
<artifactId>maven-clean-plugin</artifactId>
116-
<version>3.4.1</version>
128+
<version>${mvn-clean.version}</version>
117129
<configuration>
118130
<filesets>
119131
<fileset>
@@ -136,7 +148,7 @@
136148
<plugin>
137149
<groupId>org.apache.maven.plugins</groupId>
138150
<artifactId>maven-compiler-plugin</artifactId>
139-
<version>3.14.0</version>
151+
<version>${mvn-compiler.version}</version>
140152
<configuration>
141153
<compilerArgs>
142154
<arg>-h</arg>
@@ -148,7 +160,7 @@
148160
<plugin>
149161
<groupId>org.apache.maven.plugins</groupId>
150162
<artifactId>maven-enforcer-plugin</artifactId>
151-
<version>3.5.0</version>
163+
<version>${mvn-enforcer.version}</version>
152164
<executions>
153165
<execution>
154166
<id>check-preconditions</id>
@@ -169,7 +181,7 @@
169181
<plugin>
170182
<groupId>org.apache.maven.plugins</groupId>
171183
<artifactId>maven-dependency-plugin</artifactId>
172-
<version>3.8.1</version>
184+
<version>${mvn-dependency.version}</version>
173185
<executions>
174186
<execution>
175187
<id>jar-paths-to-properties</id>
@@ -181,7 +193,7 @@
181193
</plugin>
182194
<plugin>
183195
<artifactId>maven-resources-plugin</artifactId>
184-
<version>3.3.1</version>
196+
<version>${mvn-resources.version}</version>
185197
<executions>
186198
<execution>
187199
<id>copy-dlls</id>
@@ -212,7 +224,7 @@
212224
<dependency>
213225
<groupId>me.fabriciorby</groupId>
214226
<artifactId>maven-surefire-junit5-tree-reporter</artifactId>
215-
<version>1.4.0</version>
227+
<version>${junit-tree-reporter.version}</version>
216228
</dependency>
217229
</dependencies>
218230
<configuration>
@@ -243,7 +255,7 @@
243255
</plugin>
244256
<plugin>
245257
<artifactId>maven-source-plugin</artifactId>
246-
<version>3.3.1</version>
258+
<version>${mvn-source.version}</version>
247259
<executions>
248260
<execution>
249261
<id>attach-sources</id>
@@ -255,7 +267,7 @@
255267
</plugin>
256268
<plugin>
257269
<artifactId>maven-javadoc-plugin</artifactId>
258-
<version>3.11.2</version>
270+
<version>${mvn-javadoc.version}</version>
259271
<executions>
260272
<execution>
261273
<id>attach-javadocs</id>
@@ -357,7 +369,7 @@
357369
<plugin>
358370
<groupId>org.codehaus.mojo</groupId>
359371
<artifactId>exec-maven-plugin</artifactId>
360-
<version>3.5.0</version>
372+
<version>${exec-maven.version}</version>
361373
<configuration>
362374
<executable>cmd</executable>
363375
<workingDirectory>${project.basedir}</workingDirectory>
@@ -404,7 +416,7 @@
404416
<plugins>
405417
<plugin>
406418
<artifactId>maven-gpg-plugin</artifactId>
407-
<version>3.2.7</version>
419+
<version>${mvn-gpg.version}</version>
408420
<executions>
409421
<execution>
410422
<id>sign-artifacts</id>
@@ -454,7 +466,7 @@
454466
<plugin>
455467
<groupId>org.apache.maven.plugins</groupId>
456468
<artifactId>maven-deploy-plugin</artifactId>
457-
<version>3.1.4</version>
469+
<version>${mvn-deploy.version}</version>
458470
</plugin>
459471
</plugins>
460472
</build>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
org.cryptomator.windows.keychain.displayName=Захист даних Windows
2-
org.cryptomator.windows.keychain.displayWindowsHelloName=Пін-код Windows
2+
org.cryptomator.windows.keychain.displayWindowsHelloName=Windows Hello

0 commit comments

Comments
 (0)