Skip to content

Commit 8e908ac

Browse files
committed
Merge branch '2.19' into 2.x
2 parents a4ec08f + 6410c42 commit 8e908ac

File tree

2 files changed

+10
-18
lines changed

2 files changed

+10
-18
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
distribution: 'temurin'
3131
java-version: ${{ matrix.java_version }}
3232
cache: 'maven'
33-
server-id: sonatype-nexus-snapshots
33+
server-id: central-snapshots
3434
server-username: CI_DEPLOY_USERNAME
3535
server-password: CI_DEPLOY_PASSWORD
3636
# See https://github.com/actions/setup-java/blob/v2/docs/advanced-usage.md#Publishing-using-Apache-Maven
@@ -44,7 +44,7 @@ jobs:
4444
- name: Deploy snapshot
4545
if: ${{ github.event_name != 'pull_request' && matrix.java_version == '8' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT') }}
4646
env:
47-
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
48-
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
47+
CI_DEPLOY_USERNAME: ${{ secrets.CENTRAL_DEPLOY_USERNAME }}
48+
CI_DEPLOY_PASSWORD: ${{ secrets.CENTRAL_DEPLOY_PASSWORD }}
4949
# MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
5050
run: ./mvnw -B -ff -DskipTests -ntp source:jar deploy

pom.xml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,11 @@
6565
<!-- Alas, need to include snapshot reference since otherwise can not find
6666
snapshot of parent... -->
6767
<repositories>
68+
<!-- 26-May-2025, tatu: Using Sonatype Central Portal, will need this -->
6869
<repository>
69-
<id>sonatype-nexus-snapshots</id>
70-
<name>Sonatype Nexus Snapshots</name>
71-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
70+
<id>central-snapshots</id>
71+
<name>Sonatype Central Portal (snapshots)</name>
72+
<url>https://central.sonatype.com/repository/maven-snapshots</url>
7273
<releases><enabled>false</enabled></releases>
7374
<snapshots><enabled>true</enabled></snapshots>
7475
</repository>
@@ -113,19 +114,10 @@
113114
</executions>
114115
</plugin>
115116

116-
<!-- 08-Nov-2019, tatu: Copied from
117-
https://github.com/stephenc/git-timestamp-maven-plugin/blob/master/pom.xml#L327-L337
118-
-->
117+
<!-- 26-May-2025: Enable Sonatype Central Portal publishing -->
119118
<plugin>
120-
<groupId>org.sonatype.plugins</groupId>
121-
<artifactId>nexus-staging-maven-plugin</artifactId>
122-
<version>1.6.14</version>
123-
<extensions>true</extensions>
124-
<configuration>
125-
<serverId>sonatype-nexus-staging</serverId>
126-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
127-
<stagingProfileId>b34f19b9cc6224</stagingProfileId>
128-
</configuration>
119+
<groupId>org.sonatype.central</groupId>
120+
<artifactId>central-publishing-maven-plugin</artifactId>
129121
</plugin>
130122

131123
<!-- 20-Oct-2020, tatu: [annotations#178] copy full LICENSE from main dir

0 commit comments

Comments
 (0)