Skip to content

Commit 9176bdc

Browse files
committed
Merge branch 'develop' into release/1.7.0
2 parents a06f3df + 29c7eb5 commit 9176bdc

6 files changed

Lines changed: 13 additions & 9 deletions

File tree

.github/dependabot.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ updates:
77
day: "monday"
88
time: "06:00"
99
timezone: "Etc/UTC"
10+
ignore:
11+
- dependency-name: "org.cryptomator:integrations-api"
12+
versions: [ "2.0.0-alpha1" ]
1013
groups:
1114
java-test-dependencies:
1215
patterns:

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
id-token: write # Required for the attestations step
1616
attestations: write # Required for the attestations step
1717
steps:
18-
- uses: actions/checkout@v5
18+
- uses: actions/checkout@v6
1919
- uses: actions/setup-java@v5
2020
with:
2121
distribution: 'temurin'
@@ -33,7 +33,7 @@ jobs:
3333
subject-path: |
3434
target/*.jar
3535
target/*.pom
36-
- uses: actions/upload-artifact@v5
36+
- uses: actions/upload-artifact@v6
3737
with:
3838
name: artifacts
3939
path: target/*.jar
@@ -45,7 +45,7 @@ jobs:
4545
needs: [build]
4646
if: github.repository_owner == 'cryptomator' && (startsWith(github.ref, 'refs/tags/') || contains(github.event.head_commit.message, '[deploy]'))
4747
steps:
48-
- uses: actions/checkout@v5
48+
- uses: actions/checkout@v6
4949
- uses: actions/setup-java@v5
5050
with:
5151
distribution: 'temurin'
@@ -79,7 +79,7 @@ jobs:
7979
needs: [build]
8080
if: github.repository_owner == 'cryptomator' && (startsWith(github.ref, 'refs/tags/') || contains(github.event.head_commit.message, '[deploy]'))
8181
steps:
82-
- uses: actions/checkout@v5
82+
- uses: actions/checkout@v6
8383
- uses: actions/setup-java@v5
8484
with:
8585
java-version: ${{ env.JAVA_VERSION }}

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ 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@v5
19+
- uses: actions/checkout@v6
2020
with:
2121
fetch-depth: 2
2222
- uses: actions/setup-java@v5

.github/workflows/pullrequest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Compile and Test
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020
- uses: actions/setup-java@v5
2121
with:
2222
distribution: ${{ env.JAVA_DIST }}

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Changes to prior versions can be found on the [Github release page](https://gith
1414

1515
### Changed
1616
* Require JDK 25
17+
* Updated dependency `com.fasterxml.jackson.core:jackson-databind` from 2.20.0 to 2.20.1
1718

1819
## [1.6.1](https://github.com/cryptomator/integrations-linux/releases/tag/1.6.1) - 2025-09-17
1920

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<!-- runtime dependencies -->
4242
<api.version>1.8.0-beta1</api.version>
4343
<slf4j.version>2.0.17</slf4j.version>
44-
<jackson.version>2.20.0</jackson.version>
44+
<jackson.version>2.20.1</jackson.version>
4545
<secret-service.version>2.0.1-alpha</secret-service.version>
4646
<kdewallet.version>1.4.0</kdewallet.version>
4747
<flatpakupdateportal.version>1.1.0</flatpakupdateportal.version>
@@ -54,11 +54,11 @@
5454
<mvn-compiler.version>3.14.1</mvn-compiler.version>
5555
<mvn-surefire.version>3.5.4</mvn-surefire.version>
5656
<mvn-enforcer.version>3.6.2</mvn-enforcer.version>
57-
<mvn-source.version>3.3.1</mvn-source.version>
57+
<mvn-source.version>3.4.0</mvn-source.version>
5858
<mvn-javadoc.version>3.12.0</mvn-javadoc.version>
5959
<mvn-gpg.version>3.2.8</mvn-gpg.version>
6060
<mvn-deploy.version>3.1.4</mvn-deploy.version>
61-
<dependency-check.version>12.1.8</dependency-check.version>
61+
<dependency-check.version>12.1.9</dependency-check.version>
6262
<central-publishing.version>0.9.0</central-publishing.version>
6363
</properties>
6464

0 commit comments

Comments
 (0)