Skip to content

Commit e4cb938

Browse files
committed
Merge release/1.6.1 into main
2 parents b1d52d4 + 425fc77 commit e4cb938

File tree

16 files changed

+551
-88
lines changed

16 files changed

+551
-88
lines changed

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ updates:
1515
patterns:
1616
- "org.apache.maven.plugins:*"
1717
- "org.owasp:dependency-check-maven"
18-
- "org.sonatype.plugins:nexus-staging-maven-plugin"
18+
- "org.sonatype.central:central-publishing-maven-plugin"
1919
java-production-dependencies:
2020
patterns:
2121
- "*"
2222
exclude-patterns:
2323
- "org.junit.jupiter:*"
2424
- "org.apache.maven.plugins:*"
2525
- "org.owasp:dependency-check-maven"
26-
- "org.sonatype.plugins:nexus-staging-maven-plugin"
26+
- "org.sonatype.central:central-publishing-maven-plugin"
2727

2828
- package-ecosystem: "github-actions"
2929
directory: "/" # even for `.github/workflows`

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
name: Build
22
on:
33
push:
4-
pull_request_target:
5-
types: [labeled]
4+
65
jobs:
76
build:
87
name: Build and Test
98
runs-on: ubuntu-latest
10-
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
119
steps:
12-
- uses: actions/checkout@v4
13-
- uses: actions/setup-java@v4
10+
- uses: actions/checkout@v5
11+
- uses: actions/setup-java@v5
1412
with:
1513
distribution: 'temurin'
1614
java-version: 24
@@ -22,7 +20,7 @@ jobs:
2220
mvn -B versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
2321
- name: Build and Test
2422
id: buildAndTest
25-
run: mvn -B clean install
23+
run: mvn -B clean verify
2624
- uses: actions/upload-artifact@v4
2725
with:
2826
name: artifacts
@@ -34,3 +32,5 @@ jobs:
3432
prerelease: true
3533
token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
3634
generate_release_notes: true
35+
body: |
36+
For a list of all notable changes, read the [changelog](/CHANGELOG.md).

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
# dependeabot has on push events only read-only access, but codeql requires write access
1717
if: ${{ !(github.actor == 'dependabot[bot]' && contains(fromJSON('["push"]'), github.event_name)) }}
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
with:
2121
fetch-depth: 2
22-
- uses: actions/setup-java@v4
22+
- uses: actions/setup-java@v5
2323
with:
2424
distribution: 'temurin'
2525
java-version: 24
@@ -29,6 +29,6 @@ jobs:
2929
with:
3030
languages: java
3131
- name: Build
32-
run: mvn -B compile
32+
run: mvn -B test
3333
- name: Perform CodeQL Analysis
3434
uses: github/codeql-action/analyze@v3

.github/workflows/publish-central.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
runs-on: ubuntu-latest
88
if: startsWith(github.ref, 'refs/tags/') # only allow publishing tagged versions
99
steps:
10-
- uses: actions/checkout@v4
11-
- uses: actions/setup-java@v4
10+
- uses: actions/checkout@v5
11+
- uses: actions/setup-java@v5
1212
with:
1313
distribution: 'temurin'
1414
java-version: 24

.github/workflows/publish-github.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
runs-on: ubuntu-latest
88
if: startsWith(github.ref, 'refs/tags/') # only allow publishing tagged versions
99
steps:
10-
- uses: actions/checkout@v4
11-
- uses: actions/setup-java@v4
10+
- uses: actions/checkout@v5
11+
- uses: actions/setup-java@v5
1212
with:
1313
distribution: 'temurin'
1414
java-version: 24

.github/workflows/pullrequest.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Pull Request
2+
3+
on:
4+
pull_request:
5+
6+
env:
7+
JAVA_DIST: 'temurin'
8+
JAVA_VERSION: 24
9+
10+
defaults:
11+
run:
12+
shell: bash
13+
14+
jobs:
15+
test:
16+
name: Compile and Test
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v5
20+
- uses: actions/setup-java@v5
21+
with:
22+
distribution: ${{ env.JAVA_DIST }}
23+
java-version: ${{ env.JAVA_VERSION }}
24+
cache: 'maven'
25+
- name: Build and Test
26+
id: buildAndTest
27+
run: mvn -B clean verify

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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.6.1.
8+
Changes to prior versions can be found on the [Github release page](https://github.com/cryptomator/integrations-linux/releases).
9+
10+
## [1.6.1] - 2025-09-17
11+
12+
### Changed
13+
14+
* Updated `org.cryptomator:integrations-api` from 1.6.0 to 1.7.0
15+
* Refactor Dolphin quick access integration for robustness (#114)
16+
17+
### Fixed
18+
19+
* Remove stale bookmarks in Dolphin quick access (#114)
20+
21+

pom.xml

Lines changed: 9 additions & 9 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-linux</artifactId>
8-
<version>1.6.0</version>
8+
<version>1.6.1</version>
99

1010
<name>integrations-linux</name>
1111
<description>Provides optional Linux services used by Cryptomator</description>
@@ -40,25 +40,25 @@
4040

4141
<!-- runtime dependencies -->
4242

43-
<api.version>1.6.0</api.version>
43+
<api.version>1.7.0</api.version>
4444
<secret-service.version>2.0.1-alpha</secret-service.version>
4545
<kdewallet.version>1.4.0</kdewallet.version>
4646
<slf4j.version>2.0.17</slf4j.version>
4747
<appindicator.version>1.4.2</appindicator.version>
4848

4949
<!-- test dependencies -->
50-
<junit.version>5.12.2</junit.version>
50+
<junit.version>5.13.4</junit.version>
5151

5252
<!-- build plugin dependencies -->
5353
<mvn-compiler.version>3.14.0</mvn-compiler.version>
54-
<mvn-surefire.version>3.5.3</mvn-surefire.version>
55-
<mvn-enforcer.version>3.5.0</mvn-enforcer.version>
54+
<mvn-surefire.version>3.5.4</mvn-surefire.version>
55+
<mvn-enforcer.version>3.6.1</mvn-enforcer.version>
5656
<mvn-source.version>3.3.1</mvn-source.version>
57-
<mvn-javadoc.version>3.11.2</mvn-javadoc.version>
58-
<mvn-gpg.version>3.2.7</mvn-gpg.version>
57+
<mvn-javadoc.version>3.11.3</mvn-javadoc.version>
58+
<mvn-gpg.version>3.2.8</mvn-gpg.version>
5959
<mvn-deploy.version>3.1.4</mvn-deploy.version>
60-
<dependency-check.version>12.1.1</dependency-check.version>
61-
<central-publishing.version>0.7.0</central-publishing.version>
60+
<dependency-check.version>12.1.3</dependency-check.version>
61+
<central-publishing.version>0.8.0</central-publishing.version>
6262
</properties>
6363

6464
<dependencies>

src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
requires org.purejava.appindicator;
1919
requires org.purejava.kwallet;
2020
requires de.swiesend.secretservice;
21+
requires java.xml;
2122

2223
provides AutoStartProvider with FreedesktopAutoStartService;
2324
provides KeychainAccessProvider with GnomeKeyringKeychainAccess, KDEWalletKeychainAccess;

0 commit comments

Comments
 (0)