Skip to content

Commit 57372cc

Browse files
AB-xdevAB-xdev
authored
Merge pull request #181 from xdev-software/develop
Release
2 parents 2e0e385 + 1092fca commit 57372cc

File tree

5 files changed

+22
-56
lines changed

5 files changed

+22
-56
lines changed

‎.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,22 +121,22 @@ jobs:
121121
git config --global user.name "GitHub Actions"
122122
git pull
123123
124-
- name: Set up JDK OSSRH
124+
- name: Set up JDK
125125
uses: actions/setup-java@v4
126126
with: # running setup-java again overwrites the settings.xml
127127
java-version: '17'
128128
distribution: 'temurin'
129-
server-id: ossrh
129+
server-id: sonatype-central-portal
130130
server-username: MAVEN_CENTRAL_USERNAME
131131
server-password: MAVEN_CENTRAL_TOKEN
132132
gpg-passphrase: MAVEN_GPG_PASSPHRASE
133133
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
134134

135-
- name: Publish to OSSRH
136-
run: ../mvnw -B deploy -Possrh -DskipTests
135+
- name: Publish to Central Portal
136+
run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests
137137
env:
138-
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
139-
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
138+
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
139+
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}
140140
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
141141
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
142142

‎.github/workflows/test-deploy.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v4
1515

16-
- name: Set up JDK OSSRH
16+
- name: Set up JDK
1717
uses: actions/setup-java@v4
1818
with: # running setup-java again overwrites the settings.xml
1919
distribution: 'temurin'
2020
java-version: '17'
21-
server-id: ossrh
21+
server-id: sonatype-central-portal
2222
server-username: MAVEN_CENTRAL_USERNAME
2323
server-password: MAVEN_CENTRAL_TOKEN
2424
gpg-passphrase: MAVEN_GPG_PASSPHRASE
2525
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
2626

27-
- name: Publish to OSSRH
28-
run: ../mvnw -B deploy -Possrh -DskipTests
27+
- name: Publish to Central Portal
28+
run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests
2929
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
3030
env:
31-
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
32-
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
31+
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
32+
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}
3333
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ hs_err_pid*
7171
.idea/*
7272
!.idea/saveactions_settings.xml
7373
!.idea/checkstyle-idea.xml
74+
!.idea/externalDependencies.xml
7475

7576
!.idea/inspectionProfiles/
7677
.idea/inspectionProfiles/*

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 2.0.4
2+
* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155)
3+
14
# 2.0.3
25
* Updated dependencies (JasperReports 7.0.3)
36

‎dynamicreports-core-for-grid-exporter/pom.xml

Lines changed: 6 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -49,41 +49,6 @@
4949
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5050
</properties>
5151

52-
<repositories>
53-
<!-- The order of definitions matters. Explicitly defining central here
54-
to make sure it has the highest priority. -->
55-
<repository>
56-
<id>central</id>
57-
<url>https://repo.maven.apache.org/maven2</url>
58-
<snapshots>
59-
<enabled>false</enabled>
60-
</snapshots>
61-
</repository>
62-
</repositories>
63-
64-
<pluginRepositories>
65-
<!-- The order of definitions matters. Explicitly defining central here
66-
to make sure it has the highest priority. -->
67-
<pluginRepository>
68-
<id>central</id>
69-
<url>https://repo.maven.apache.org/maven2</url>
70-
<snapshots>
71-
<enabled>false</enabled>
72-
</snapshots>
73-
</pluginRepository>
74-
</pluginRepositories>
75-
76-
<distributionManagement>
77-
<snapshotRepository>
78-
<id>ossrh</id>
79-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
80-
</snapshotRepository>
81-
<repository>
82-
<id>ossrh</id>
83-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
84-
</repository>
85-
</distributionManagement>
86-
8752
<dependencies>
8853
<!-- Used for reports -->
8954
<dependency>
@@ -225,7 +190,7 @@
225190
</build>
226191
<profiles>
227192
<profile>
228-
<id>ossrh</id>
193+
<id>publish-sonatype-central-portal</id>
229194
<build>
230195
<plugins>
231196
<plugin>
@@ -269,16 +234,13 @@
269234
</plugin>
270235

271236
<plugin>
272-
<groupId>org.sonatype.plugins</groupId>
273-
<artifactId>nexus-staging-maven-plugin</artifactId>
274-
<version>1.7.0</version>
237+
<groupId>org.sonatype.central</groupId>
238+
<artifactId>central-publishing-maven-plugin</artifactId>
239+
<version>0.7.0</version>
275240
<extensions>true</extensions>
276241
<configuration>
277-
<serverId>ossrh</serverId>
278-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
279-
<!-- Sometimes OSSRH is really slow -->
280-
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
281-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
242+
<publishingServerId>sonatype-central-portal</publishingServerId>
243+
<autoPublish>true</autoPublish>
282244
</configuration>
283245
</plugin>
284246
</plugins>

0 commit comments

Comments
 (0)