Skip to content

Commit 832d4f9

Browse files
committed
Merge branch 'release/1.5.3'
2 parents 491b93f + ae571d7 commit 832d4f9

File tree

3 files changed

+27
-50
lines changed

3 files changed

+27
-50
lines changed

.github/workflows/publish-central.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
11
name: Publish to Maven Central
22
on:
3-
workflow_dispatch:
4-
inputs:
5-
tag:
6-
description: 'Tag'
7-
required: true
8-
default: '0.0.0'
3+
release:
4+
types: [published]
95
jobs:
106
publish:
117
runs-on: ubuntu-latest
8+
if: startsWith(github.ref, 'refs/tags/') # only allow publishing tagged versions
129
steps:
1310
- uses: actions/checkout@v4
14-
with:
15-
ref: "refs/tags/${{ github.event.inputs.tag }}"
1611
- uses: actions/setup-java@v4
1712
with:
1813
distribution: 'zulu'
1914
java-version: 22
2015
cache: 'maven'
21-
server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
22-
server-username: MAVEN_USERNAME # env variable for username in deploy
23-
server-password: MAVEN_PASSWORD # env variable for token in deploy
24-
- name: Enforce project version ${{ github.event.inputs.tag }}
25-
run: mvn versions:set -B -DnewVersion=${{ github.event.inputs.tag }}
16+
server-id: central
17+
server-username: MAVEN_CENTRAL_USERNAME
18+
server-password: MAVEN_CENTRAL_PASSWORD
19+
- name: Verify project version = ${{ github.event.release.tag_name }}
20+
run: |
21+
PROJECT_VERSION=$(mvn help:evaluate "-Dexpression=project.version" -q -DforceStdout)
22+
test "$PROJECT_VERSION" = "${{ github.event.release.tag_name }}"
2623
- name: Deploy
2724
run: mvn deploy -B -DskipTests -Psign,deploy-central --no-transfer-progress
2825
env:
@@ -31,8 +28,8 @@ jobs:
3128
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
3229
--add-opens=java.base/java.text=ALL-UNNAMED
3330
--add-opens=java.desktop/java.awt.font=ALL-UNNAMED
34-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
35-
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
31+
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
32+
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
3633
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
3734
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
3835
MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}

.github/workflows/publish-github.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,4 @@ jobs:
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2222
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
2323
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
24-
MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}
25-
- name: Slack Notification
26-
uses: rtCamp/action-slack-notify@v2
27-
env:
28-
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
29-
SLACK_USERNAME: 'Cryptobot'
30-
SLACK_ICON:
31-
SLACK_ICON_EMOJI: ':bot:'
32-
SLACK_CHANNEL: 'cryptomator-desktop'
33-
SLACK_TITLE: "Published ${{ github.event.repository.name }} ${{ github.event.release.tag_name }}"
34-
SLACK_MESSAGE: "Ready to <https://github.com/${{ github.repository }}/actions/workflows/publish-central.yml|deploy to Maven Central>."
35-
SLACK_FOOTER:
36-
MSG_MINIMAL: true
24+
MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}

pom.xml

Lines changed: 14 additions & 22 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.5.2</version>
8+
<version>1.5.3</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.4.0</api.version>
43+
<api.version>1.5.1</api.version>
4444
<secret-service.version>2.0.1-alpha</secret-service.version>
4545
<kdewallet.version>1.4.0</kdewallet.version>
46-
<slf4j.version>2.0.16</slf4j.version>
47-
<appindicator.version>1.4.1</appindicator.version>
46+
<slf4j.version>2.0.17</slf4j.version>
47+
<appindicator.version>1.4.2</appindicator.version>
4848

4949
<!-- test dependencies -->
50-
<junit.version>5.11.4</junit.version>
50+
<junit.version>5.12.0</junit.version>
5151

5252
<!-- build plugin dependencies -->
53-
<mvn-compiler.version>3.13.0</mvn-compiler.version>
53+
<mvn-compiler.version>3.14.0</mvn-compiler.version>
5454
<mvn-surefire.version>3.5.2</mvn-surefire.version>
5555
<mvn-enforcer.version>3.5.0</mvn-enforcer.version>
5656
<mvn-source.version>3.3.1</mvn-source.version>
5757
<mvn-javadoc.version>3.11.2</mvn-javadoc.version>
5858
<mvn-gpg.version>3.2.7</mvn-gpg.version>
59-
<mvn-deploy.version>3.1.3</mvn-deploy.version>
60-
<dependency-check.version>11.1.1</dependency-check.version>
61-
<nexus-staging.version>1.7.0</nexus-staging.version>
59+
<mvn-deploy.version>3.1.4</mvn-deploy.version>
60+
<dependency-check.version>12.1.0</dependency-check.version>
61+
<central-publishing.version>0.7.0</central-publishing.version>
6262
</properties>
6363

6464
<dependencies>
@@ -266,24 +266,16 @@
266266

267267
<profile>
268268
<id>deploy-central</id>
269-
<distributionManagement>
270-
<repository>
271-
<id>ossrh</id>
272-
<name>Maven Central</name>
273-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
274-
</repository>
275-
</distributionManagement>
276269
<build>
277270
<plugins>
278271
<plugin>
279-
<groupId>org.sonatype.plugins</groupId>
280-
<artifactId>nexus-staging-maven-plugin</artifactId>
281-
<version>${nexus-staging.version}</version>
272+
<groupId>org.sonatype.central</groupId>
273+
<artifactId>central-publishing-maven-plugin</artifactId>
274+
<version>${central-publishing.version}</version>
282275
<extensions>true</extensions>
283276
<configuration>
284-
<serverId>ossrh</serverId>
285-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
286-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
277+
<publishingServerId>central</publishingServerId>
278+
<autoPublish>true</autoPublish>
287279
</configuration>
288280
</plugin>
289281
</plugins>

0 commit comments

Comments
 (0)