Skip to content

Commit a052dd0

Browse files
Merge branch 'develop' into update-mechanism
# Conflicts: # pom.xml
2 parents 41d8e4c + eaa522c commit a052dd0

File tree

7 files changed

+38
-20
lines changed

7 files changed

+38
-20
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ updates:
1515
maven-build-plugins:
1616
patterns:
1717
- "org.apache.maven.plugins:*"
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.apache.maven.plugins:*"
24-
- "org.sonatype.plugins:nexus-staging-maven-plugin"
24+
- "org.sonatype.central:central-publishing-maven-plugin"
2525
- "org.junit.jupiter:*"
2626
- "org.mockito:*"
2727

@@ -33,6 +33,4 @@ updates:
3333
groups:
3434
github-actions:
3535
patterns:
36-
- "*"
37-
labels:
38-
- "ci"
36+
- "*"

.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jobs:
99
runs-on: ubuntu-latest
1010
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
1111
steps:
12-
- uses: actions/checkout@v4
13-
- uses: actions/setup-java@v4
12+
- uses: actions/checkout@v5
13+
- uses: actions/setup-java@v5
1414
with:
1515
distribution: 'temurin'
1616
java-version: 21
@@ -32,3 +32,5 @@ jobs:
3232
prerelease: true
3333
token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
3434
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: 2 additions & 2 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: 21

.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: 21

.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: 21

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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.7.0.
8+
Changes to prior versions can be found on the [Github release page](https://github.com/cryptomator/integrations-api/releases).
9+
10+
## [Unreleased]
11+
12+
No changes yet.
13+
14+
## [1.7.0] - 2025-09-17
15+
16+
### Changed
17+
18+
* **[BREAKING]** Updated required build JDK to 21 (a88fa29d9cc05a0e39ab15420517d0f25cff6f35)

pom.xml

Lines changed: 7 additions & 7 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-api</artifactId>
8-
<version>1.7.0-SNAPSHOT</version>
8+
<version>1.8.0-SNAPSHOT</version>
99

1010
<name>Cryptomator Integrations API</name>
1111
<description>Defines optional service interfaces that may be used by Cryptomator</description>
@@ -30,19 +30,19 @@
3030
<jdk.version>21</jdk.version>
3131

3232
<slf4j.version>2.0.17</slf4j.version>
33-
<jetbrains-annotation.version>26.0.2</jetbrains-annotation.version>
33+
<jetbrains-annotation.version>26.0.2-1</jetbrains-annotation.version>
3434

3535
<!-- Test dependencies -->
36-
<junit.version>5.12.1</junit.version>
36+
<junit.version>5.13.4</junit.version>
3737
<mockito.version>5.20.0</mockito.version>
3838

3939
<!-- Build dependencies -->
4040
<mvn-compiler.version>3.14.0</mvn-compiler.version>
4141
<mvn-source.version>3.3.1</mvn-source.version>
42-
<mvn-surefire.version>3.5.3</mvn-surefire.version>
43-
<mvn-javadoc.version>3.11.2</mvn-javadoc.version>
44-
<mvn-gpg.version>3.2.7</mvn-gpg.version>
45-
<central-publishing.version>0.7.0</central-publishing.version>
42+
<mvn-surefire.version>3.5.4</mvn-surefire.version>
43+
<mvn-javadoc.version>3.11.3</mvn-javadoc.version>
44+
<mvn-gpg.version>3.2.8</mvn-gpg.version>
45+
<central-publishing.version>0.8.0</central-publishing.version>
4646
</properties>
4747

4848
<licenses>

0 commit comments

Comments
 (0)