Skip to content

Commit 02d6875

Browse files
jeremylongjeremylong
committed
build: utilize central publishing
1 parent 5d81c4c commit 02d6875

File tree

4 files changed

+27
-37
lines changed

4 files changed

+27
-37
lines changed

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Install gpg secret key
2121
id: install-gpg-key
2222
run: |
23-
cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import
23+
cat <(echo -e "${{ secrets.GPG_PRIVATE_KEY }}") | gpg --batch --import
2424
gpg --list-secret-keys --keyid-format LONG
2525
- uses: actions/checkout@v4
2626
- name: Check Maven Cache
@@ -52,19 +52,19 @@ jobs:
5252
with:
5353
java-version: 11
5454
distribution: 'zulu'
55-
server-id: ossrh
56-
server-username: ${{ secrets.OSSRH_USERNAME }}
57-
server-password: ${{ secrets.OSSRH_TOKEN }}
55+
server-id: central
56+
server-username: ${{ secrets.CENTRAL_USER }}
57+
server-password: ${{ secrets.CENTRAL_PASSWORD }}
5858
- uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
5959
with:
6060
version: 6.0.2
6161
- name: Build Snapshot with Maven
6262
id: build-snapshot
6363
env:
64-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
65-
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
64+
CENTRAL_USERNAME: ${{ secrets.CENTRAL_USER }}
65+
CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}
6666
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
67-
run: mvn -V -s settings.xml -Prelease clean package verify source:jar javadoc:jar gpg:sign deploy -DreleaseTesting --no-transfer-progress --batch-mode -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
67+
run: mvn -V -s settings.xml -Prelease clean package verify source:jar javadoc:jar gpg:sign deploy -DreleaseTesting --no-transfer-progress --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PRIVATE_KEY_PASSWORD }}
6868
- name: SARIF Multitool
6969
uses: microsoft/[email protected]
7070
with:

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Install gpg secret key
2525
id: install-gpg-key
2626
run: |
27-
cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import
27+
cat <(echo -e "${{ secrets.GPG_PRIVATE_KEY }}") | gpg --batch --import
2828
gpg --list-secret-keys --keyid-format LONG
2929
- uses: actions/checkout@v4
3030
- name: Check Maven Cache
@@ -54,9 +54,9 @@ jobs:
5454
with:
5555
java-version: 11
5656
distribution: 'zulu'
57-
server-id: ossrh
58-
server-username: ${{ secrets.OSSRH_USERNAME }}
59-
server-password: ${{ secrets.OSSRH_TOKEN }}
57+
server-id: central
58+
server-username: ${{ secrets.CENTRAL_USER }}
59+
server-password: ${{ secrets.CENTRAL_PASSWORD }}
6060
- uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
6161
with:
6262
version: 6.0.2
@@ -72,11 +72,11 @@ jobs:
7272
id: build-release
7373
timeout-minutes: 120
7474
env:
75-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
76-
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
75+
CENTRAL_USERNAME: ${{ secrets.CENTRAL_USER }}
76+
CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}
7777
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
7878
run: |
79-
mvn -V -s settings.xml -Prelease "-DnexusUrl=https://oss.sonatype.org/" clean package source:jar javadoc:jar gpg:sign deploy site site:stage -DreleaseTesting --no-transfer-progress --batch-mode -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
79+
mvn -V -s settings.xml -Prelease clean package source:jar javadoc:jar gpg:sign deploy site site:stage -DreleaseTesting --no-transfer-progress --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PRIVATE_KEY_PASSWORD }}
8080
- name: Archive code coverage results
8181
id: archive-coverage
8282
uses: actions/upload-artifact@v4

‎pom.xml‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,6 @@ Copyright (c) 2012 - Jeremy Long
177177
<mock-server.version>5.15.0</mock-server.version>
178178
</properties>
179179
<distributionManagement>
180-
<snapshotRepository>
181-
<id>ossrh</id>
182-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
183-
</snapshotRepository>
184-
<repository>
185-
<id>ossrh</id>
186-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
187-
</repository>
188180
<site>
189181
<id>gh-pages</id>
190182
<name>gh-pages</name>
@@ -271,9 +263,9 @@ Copyright (c) 2012 - Jeremy Long
271263
<version>3.1.1</version>
272264
</plugin>
273265
<plugin>
274-
<groupId>org.sonatype.plugins</groupId>
275-
<artifactId>nexus-staging-maven-plugin</artifactId>
276-
<version>1.7.0</version>
266+
<groupId>org.sonatype.central</groupId>
267+
<artifactId>central-publishing-maven-plugin</artifactId>
268+
<version>0.8.0</version>
277269
</plugin>
278270
<plugin>
279271
<groupId>org.apache.maven.plugins</groupId>
@@ -730,14 +722,14 @@ Copyright (c) 2012 - Jeremy Long
730722
</configuration>
731723
</plugin>
732724
<plugin>
733-
<groupId>org.sonatype.plugins</groupId>
734-
<artifactId>nexus-staging-maven-plugin</artifactId>
725+
<groupId>org.sonatype.central</groupId>
726+
<artifactId>central-publishing-maven-plugin</artifactId>
727+
<version>0.8.0</version>
735728
<extensions>true</extensions>
736729
<configuration>
737-
<serverId>ossrh</serverId>
738-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
739-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
740-
<stagingProgressTimeoutMinutes>120</stagingProgressTimeoutMinutes>
730+
<publishingServerId>central</publishingServerId>
731+
<autoPublish>true</autoPublish>
732+
<waitUntil>published</waitUntil>
741733
</configuration>
742734
</plugin>
743735
<plugin>

‎settings.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
https://maven.apache.org/xsd/settings-1.0.0.xsd">
55
<servers>
66
<server>
7-
<id>ossrh</id>
8-
<username>${env.MAVEN_USERNAME}</username>
9-
<password>${env.MAVEN_PASSWORD}</password>
7+
<id>central</id>
8+
<username>${env.CENTRAL_USER}</username>
9+
<password>${env.CENTRAL_PASSWORD}</password>
1010
</server>
1111
</servers>
1212
<profiles>
1313
<profile>
1414
<id>default</id>
15-
<properties>
16-
17-
</properties>
15+
<properties></properties>
1816
</profile>
1917
</profiles>
2018
<activeProfiles>

0 commit comments

Comments
 (0)