Skip to content

Commit 114fd6c

Browse files
infeoinfeo
committed
Merge branch 'release/1.5.0'
2 parents 80913cb + d5dbfa5 commit 114fd6c

File tree

5 files changed

+180
-125
lines changed

5 files changed

+180
-125
lines changed

‎.github/workflows/publish-central.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ jobs:
2121
server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
2222
server-username: MAVEN_USERNAME # env variable for username in deploy
2323
server-password: MAVEN_PASSWORD # env variable for token in deploy
24-
gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
25-
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
2624
- name: Enforce project version ${{ github.event.inputs.tag }}
2725
run: mvn versions:set -B -DnewVersion=${{ github.event.inputs.tag }}
2826
- name: Deploy
@@ -35,4 +33,5 @@ jobs:
3533
--add-opens=java.desktop/java.awt.font=ALL-UNNAMED
3634
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
3735
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
38-
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
36+
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
37+
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import

‎.github/workflows/publish-github.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ jobs:
1313
distribution: 'temurin'
1414
java-version: 17
1515
cache: 'maven'
16-
gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
17-
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
1816
- name: Enforce project version ${{ github.event.release.tag_name }}
1917
run: mvn versions:set -B -DnewVersion=${{ github.event.release.tag_name }}
2018
- name: Deploy
2119
run: mvn deploy -B -DskipTests -Psign,deploy-github --no-transfer-progress
2220
env:
2321
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2422
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
23+
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
2524
- name: Slack Notification
2625
uses: rtCamp/action-slack-notify@v2
2726
env:

‎pom.xml‎

Lines changed: 139 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -1,154 +1,184 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
6-
<groupId>org.cryptomator</groupId>
7-
<artifactId>integrations-api</artifactId>
8-
<version>1.4.0</version>
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>org.cryptomator</groupId>
7+
<artifactId>integrations-api</artifactId>
8+
<version>1.5.0</version>
99

10-
<name>Cryptomator Integrations API</name>
11-
<description>Defines optional service interfaces that may be used by Cryptomator</description>
12-
<url>https://github.com/cryptomator/integrations-api</url>
13-
<scm>
14-
<connection>scm:git:[email protected]:cryptomator/integrations-api.git</connection>
15-
<developerConnection>scm:git:[email protected]:cryptomator/integrations-api.git</developerConnection>
16-
<url>[email protected]:cryptomator/integrations-api.git</url>
17-
</scm>
18-
<developers>
19-
<developer>
20-
<name>Sebastian Stenzel</name>
21-
<email>[email protected]</email>
22-
<timezone>+1</timezone>
23-
<organization>Skymatic GmbH</organization>
24-
<organizationUrl>http://skymatic.de</organizationUrl>
25-
</developer>
26-
</developers>
10+
<name>Cryptomator Integrations API</name>
11+
<description>Defines optional service interfaces that may be used by Cryptomator</description>
12+
<url>https://github.com/cryptomator/integrations-api</url>
13+
<scm>
14+
<connection>scm:git:[email protected]:cryptomator/integrations-api.git</connection>
15+
<developerConnection>scm:git:[email protected]:cryptomator/integrations-api.git</developerConnection>
16+
<url>[email protected]:cryptomator/integrations-api.git</url>
17+
</scm>
18+
<developers>
19+
<developer>
20+
<name>Sebastian Stenzel</name>
21+
<email>[email protected]</email>
22+
<timezone>+1</timezone>
23+
<organization>Skymatic GmbH</organization>
24+
<organizationUrl>http://skymatic.de</organizationUrl>
25+
</developer>
26+
</developers>
2727

28-
<properties>
29-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30-
</properties>
28+
<properties>
29+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30+
<jdk.version>17</jdk.version>
3131

32-
<licenses>
33-
<license>
34-
<name>GNU Affero General Public License (AGPL) version 3.0</name>
35-
<url>https://www.gnu.org/licenses/agpl.txt</url>
36-
<distribution>repo</distribution>
37-
</license>
38-
</licenses>
32+
<slf4j.version>2.0.16</slf4j.version>
33+
<jetbrains-annotation.version>26.0.1</jetbrains-annotation.version>
34+
35+
<!-- Test dependencies -->
36+
<junit.version>5.11.4</junit.version>
37+
<mockito.version>5.15.2</mockito.version>
38+
39+
<!-- Build dependencies -->
40+
<mvn-compiler.version>3.13.0</mvn-compiler.version>
41+
<mvn-source.version>3.3.1</mvn-source.version>
42+
<mvn-surefire.version>3.5.2</mvn-surefire.version>
43+
<mvn-javadoc.version>3.11.2</mvn-javadoc.version>
44+
<mvn-gpg.version>3.2.7</mvn-gpg.version>
45+
<nexus-staging.version>1.7.0</nexus-staging.version>
46+
</properties>
47+
48+
<licenses>
49+
<license>
50+
<name>GNU Affero General Public License (AGPL) version 3.0</name>
51+
<url>https://www.gnu.org/licenses/agpl.txt</url>
52+
<distribution>repo</distribution>
53+
</license>
54+
</licenses>
3955

4056
<dependencies>
4157
<dependency>
4258
<groupId>org.slf4j</groupId>
4359
<artifactId>slf4j-api</artifactId>
44-
<version>2.0.13</version>
60+
<version>${slf4j.version}</version>
4561
</dependency>
4662

4763
<dependency>
4864
<groupId>org.jetbrains</groupId>
4965
<artifactId>annotations</artifactId>
50-
<version>24.1.0</version>
66+
<version>${jetbrains-annotation.version}</version>
5167
<scope>provided</scope>
5268
</dependency>
5369
<dependency>
5470
<groupId>org.slf4j</groupId>
5571
<artifactId>slf4j-simple</artifactId>
56-
<version>2.0.13</version>
72+
<version>${slf4j.version}</version>
5773
<scope>test</scope>
5874
</dependency>
5975
<dependency>
6076
<groupId>org.junit.jupiter</groupId>
6177
<artifactId>junit-jupiter</artifactId>
62-
<version>5.10.3</version>
78+
<version>${junit.version}</version>
6379
<scope>test</scope>
6480
</dependency>
6581
<dependency>
6682
<groupId>org.mockito</groupId>
6783
<artifactId>mockito-core</artifactId>
68-
<version>5.12.0</version>
84+
<version>${mockito.version}</version>
6985
<scope>test</scope>
7086
</dependency>
7187
</dependencies>
7288

73-
<build>
74-
<plugins>
75-
<plugin>
76-
<groupId>org.apache.maven.plugins</groupId>
77-
<artifactId>maven-compiler-plugin</artifactId>
78-
<version>3.13.0</version>
79-
<configuration>
80-
<release>17</release>
81-
</configuration>
82-
</plugin>
83-
<plugin>
84-
<artifactId>maven-source-plugin</artifactId>
85-
<version>3.3.1</version>
86-
<executions>
87-
<execution>
88-
<id>attach-sources</id>
89-
<goals>
90-
<goal>jar-no-fork</goal>
91-
</goals>
92-
</execution>
93-
</executions>
94-
</plugin>
89+
<build>
90+
<plugins>
91+
<plugin>
92+
<groupId>org.apache.maven.plugins</groupId>
93+
<artifactId>maven-compiler-plugin</artifactId>
94+
<version>${mvn-compiler.version}</version>
95+
<configuration>
96+
<release>${jdk.version}</release>
97+
</configuration>
98+
</plugin>
99+
<plugin>
100+
<artifactId>maven-source-plugin</artifactId>
101+
<version>${mvn-source.version}</version>
102+
<executions>
103+
<execution>
104+
<id>attach-sources</id>
105+
<goals>
106+
<goal>jar-no-fork</goal>
107+
</goals>
108+
</execution>
109+
</executions>
110+
</plugin>
95111
<plugin>
96112
<groupId>org.apache.maven.plugins</groupId>
97113
<artifactId>maven-surefire-plugin</artifactId>
98-
<version>3.3.1</version>
114+
<version>${mvn-surefire.version}</version>
115+
</plugin>
116+
<plugin>
117+
<artifactId>maven-javadoc-plugin</artifactId>
118+
<version>${mvn-javadoc.version}</version>
119+
<executions>
120+
<execution>
121+
<id>attach-javadocs</id>
122+
<goals>
123+
<goal>jar</goal>
124+
</goals>
125+
</execution>
126+
</executions>
127+
<configuration>
128+
<quiet>true</quiet>
129+
<release>17</release>
130+
<tags>
131+
<!-- workaround for "unknown tag: implNote", see https://blog.codefx.org/java/new-javadoc-tags/#Maven -->
132+
<tag>
133+
<name>apiNote</name>
134+
<placement>a</placement>
135+
<head>API Note:</head>
136+
</tag>
137+
<tag>
138+
<name>implSpec</name>
139+
<placement>a</placement>
140+
<head>Implementation Requirements:</head>
141+
</tag>
142+
<tag>
143+
<name>implNote</name>
144+
<placement>a</placement>
145+
<head>Implementation Note:</head>
146+
</tag>
147+
<tag>
148+
<name>param</name>
149+
</tag>
150+
<tag>
151+
<name>return</name>
152+
</tag>
153+
<tag>
154+
<name>throws</name>
155+
</tag>
156+
<tag>
157+
<name>since</name>
158+
</tag>
159+
<tag>
160+
<name>version</name>
161+
</tag>
162+
<tag>
163+
<name>serialData</name>
164+
</tag>
165+
<tag>
166+
<name>see</name>
167+
</tag>
168+
</tags>
169+
</configuration>
99170
</plugin>
100-
<plugin>
101-
<artifactId>maven-javadoc-plugin</artifactId>
102-
<version>3.8.0</version>
103-
<executions>
104-
<execution>
105-
<id>attach-javadocs</id>
106-
<goals>
107-
<goal>jar</goal>
108-
</goals>
109-
</execution>
110-
</executions>
111-
<configuration>
112-
<quiet>true</quiet>
113-
<release>17</release>
114-
<tags>
115-
<!-- workaround for "unknown tag: implNote", see https://blog.codefx.org/java/new-javadoc-tags/#Maven -->
116-
<tag>
117-
<name>apiNote</name>
118-
<placement>a</placement>
119-
<head>API Note:</head>
120-
</tag>
121-
<tag>
122-
<name>implSpec</name>
123-
<placement>a</placement>
124-
<head>Implementation Requirements:</head>
125-
</tag>
126-
<tag>
127-
<name>implNote</name>
128-
<placement>a</placement>
129-
<head>Implementation Note:</head>
130-
</tag>
131-
<tag><name>param</name></tag>
132-
<tag><name>return</name></tag>
133-
<tag><name>throws</name></tag>
134-
<tag><name>since</name></tag>
135-
<tag><name>version</name></tag>
136-
<tag><name>serialData</name></tag>
137-
<tag><name>see</name></tag>
138-
</tags>
139-
</configuration>
140-
</plugin>
141-
</plugins>
142-
</build>
171+
</plugins>
172+
</build>
143173

144-
<profiles>
174+
<profiles>
145175
<profile>
146176
<id>sign</id>
147177
<build>
148178
<plugins>
149179
<plugin>
150180
<artifactId>maven-gpg-plugin</artifactId>
151-
<version>3.2.4</version>
181+
<version>${mvn-gpg.version}</version>
152182
<executions>
153183
<execution>
154184
<id>sign-artifacts</id>
@@ -157,10 +187,7 @@
157187
<goal>sign</goal>
158188
</goals>
159189
<configuration>
160-
<gpgArguments>
161-
<arg>--pinentry-mode</arg>
162-
<arg>loopback</arg>
163-
</gpgArguments>
190+
<signer>bc</signer>
164191
</configuration>
165192
</execution>
166193
</executions>
@@ -183,7 +210,7 @@
183210
<plugin>
184211
<groupId>org.sonatype.plugins</groupId>
185212
<artifactId>nexus-staging-maven-plugin</artifactId>
186-
<version>1.7.0</version>
213+
<version>${nexus-staging.version}</version>
187214
<extensions>true</extensions>
188215
<configuration>
189216
<serverId>ossrh</serverId>
@@ -206,4 +233,4 @@
206233
</distributionManagement>
207234
</profile>
208235
</profiles>
209-
</project>
236+
</project>

0 commit comments

Comments
 (0)