Skip to content

Commit d73d6e8

Browse files
AB-xdevAB-xdev
authored
Merge pull request #111 from xdev-software/develop
Release
2 parents 1b5b069 + 0b3484c commit d73d6e8

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+
# 1.1.1
2+
* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155)
3+
14
# 1.1.0
25
* Remove testcontainer's dependency [onto JUnit 4](https://github.com/xdev-software/testcontainers-junit4-mock/?tab=readme-ov-file)
36
* Updated dependencies

‎testcontainers-advanced-imagebuilder/pom.xml‎

Lines changed: 6 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -52,41 +52,6 @@
5252
<skipTests>true</skipTests>
5353
</properties>
5454

55-
<repositories>
56-
<!-- The order of definitions matters. Explicitly defining central here
57-
to make sure it has the highest priority. -->
58-
<repository>
59-
<id>central</id>
60-
<url>https://repo.maven.apache.org/maven2</url>
61-
<snapshots>
62-
<enabled>false</enabled>
63-
</snapshots>
64-
</repository>
65-
</repositories>
66-
67-
<pluginRepositories>
68-
<!-- The order of definitions matters. Explicitly defining central here
69-
to make sure it has the highest priority. -->
70-
<pluginRepository>
71-
<id>central</id>
72-
<url>https://repo.maven.apache.org/maven2</url>
73-
<snapshots>
74-
<enabled>false</enabled>
75-
</snapshots>
76-
</pluginRepository>
77-
</pluginRepositories>
78-
79-
<distributionManagement>
80-
<snapshotRepository>
81-
<id>ossrh</id>
82-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
83-
</snapshotRepository>
84-
<repository>
85-
<id>ossrh</id>
86-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
87-
</repository>
88-
</distributionManagement>
89-
9055
<dependencies>
9156
<dependency>
9257
<groupId>org.testcontainers</groupId>
@@ -234,7 +199,7 @@
234199
</properties>
235200
</profile>
236201
<profile>
237-
<id>ossrh</id>
202+
<id>publish-sonatype-central-portal</id>
238203
<build>
239204
<plugins>
240205
<plugin>
@@ -278,16 +243,13 @@
278243
</plugin>
279244

280245
<plugin>
281-
<groupId>org.sonatype.plugins</groupId>
282-
<artifactId>nexus-staging-maven-plugin</artifactId>
283-
<version>1.7.0</version>
246+
<groupId>org.sonatype.central</groupId>
247+
<artifactId>central-publishing-maven-plugin</artifactId>
248+
<version>0.7.0</version>
284249
<extensions>true</extensions>
285250
<configuration>
286-
<serverId>ossrh</serverId>
287-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
288-
<!-- Sometimes OSSRH is really slow -->
289-
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
290-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
251+
<publishingServerId>sonatype-central-portal</publishingServerId>
252+
<autoPublish>true</autoPublish>
291253
</configuration>
292254
</plugin>
293255
</plugins>

0 commit comments

Comments
 (0)