Skip to content

Commit 7dbc64f

Browse files
committed
Merge branch 'release/1.7.0'
2 parents be3003b + 686d271 commit 7dbc64f

File tree

12 files changed

+40
-32
lines changed

12 files changed

+40
-32
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ 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'
16-
java-version: 17
16+
java-version: 21
1717
cache: 'maven'
1818
- name: Ensure to use tagged version
1919
if: startsWith(github.ref, 'refs/tags/')

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ 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'
25-
java-version: 17
25+
java-version: 21
2626
cache: 'maven'
2727
- name: Initialize CodeQL
2828
uses: github/codeql-action/init@v3

.github/workflows/publish-central.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ 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'
14-
java-version: 17
14+
java-version: 21
1515
cache: 'maven'
1616
server-id: central
1717
server-username: MAVEN_CENTRAL_USERNAME

.github/workflows/publish-github.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ 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'
14-
java-version: 17
14+
java-version: 21
1515
cache: 'maven'
1616
- name: Enforce project version ${{ github.event.release.tag_name }}
1717
run: mvn versions:set -B -DnewVersion=${{ github.event.release.tag_name }}

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
## [1.7.0] - 2025-09-17
11+
12+
### Changed
13+
14+
* **[BREAKING]** Updated required build JDK to 21 (a88fa29d9cc05a0e39ab15420517d0f25cff6f35)

pom.xml

Lines changed: 10 additions & 10 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.6.0</version>
8+
<version>1.7.0</version>
99

1010
<name>Cryptomator Integrations API</name>
1111
<description>Defines optional service interfaces that may be used by Cryptomator</description>
@@ -27,22 +27,22 @@
2727

2828
<properties>
2929
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30-
<jdk.version>17</jdk.version>
30+
<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>
37-
<mockito.version>5.16.1</mockito.version>
36+
<junit.version>5.13.4</junit.version>
37+
<mockito.version>5.19.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>
@@ -126,7 +126,7 @@
126126
</executions>
127127
<configuration>
128128
<quiet>true</quiet>
129-
<release>17</release>
129+
<release>21</release>
130130
<tags>
131131
<!-- workaround for "unknown tag: implNote", see https://blog.codefx.org/java/new-javadoc-tags/#Maven -->
132132
<tag>

src/main/java/org/cryptomator/integrations/common/CheckAvailability.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,5 @@
4343
@Retention(RetentionPolicy.RUNTIME)
4444
@Target({ElementType.TYPE, ElementType.METHOD})
4545
@Inherited
46-
@ApiStatus.Experimental
4746
public @interface CheckAvailability {
4847
}

src/main/java/org/cryptomator/integrations/common/DisplayName.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
@Documented
2020
@Retention(RetentionPolicy.RUNTIME)
2121
@Target(ElementType.TYPE)
22-
@ApiStatus.Experimental
2322
public @interface DisplayName {
2423
String value();
2524
}

0 commit comments

Comments
 (0)