Skip to content

Commit 3f4438c

Browse files
AB-xdevAB-xdev
authored
Merge pull request #218 from xdev-software/develop
Release
2 parents e66a611 + a4cad49 commit 3f4438c

7 files changed

Lines changed: 25 additions & 59 deletions

File tree

‎.github/workflows/broken-links.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- name: Link Checker
2121
id: lychee
22-
uses: lycheeverse/lychee-action@1d97d84f0bc547f7b25f4c2170d87d810dc2fb2c # v2
22+
uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2
2323
with:
2424
fail: false # Don't fail on broken links, create an issue instead
2525

‎.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.3
2+
* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155)
3+
14
# 1.1.2
25
* Update docs
36
* Fix ``ContainerMemory#M8G`` being the same as ``ContainerMemory#M4G``

‎tci-advanced-demo/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
<dependency>
131131
<groupId>software.xdev</groupId>
132132
<artifactId>testcontainers-selenium</artifactId>
133-
<version>1.1.0</version>
133+
<version>1.2.0</version>
134134
</dependency>
135135
<dependency>
136136
<groupId>software.xdev</groupId>
@@ -140,7 +140,7 @@
140140
<dependency>
141141
<groupId>software.xdev</groupId>
142142
<artifactId>testcontainers-advanced-imagebuilder</artifactId>
143-
<version>1.0.2</version>
143+
<version>1.1.0</version>
144144
</dependency>
145145
<dependency>
146146
<groupId>org.testcontainers</groupId>

‎tci-base/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
<!-- TestContainers -->
8954
<dependency>
@@ -239,7 +204,7 @@
239204
</build>
240205
</profile>
241206
<profile>
242-
<id>ossrh</id>
207+
<id>publish-sonatype-central-portal</id>
243208
<build>
244209
<plugins>
245210
<plugin>
@@ -283,16 +248,13 @@
283248
</plugin>
284249

285250
<plugin>
286-
<groupId>org.sonatype.plugins</groupId>
287-
<artifactId>nexus-staging-maven-plugin</artifactId>
288-
<version>1.7.0</version>
251+
<groupId>org.sonatype.central</groupId>
252+
<artifactId>central-publishing-maven-plugin</artifactId>
253+
<version>0.7.0</version>
289254
<extensions>true</extensions>
290255
<configuration>
291-
<serverId>ossrh</serverId>
292-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
293-
<!-- Sometimes OSSRH is really slow -->
294-
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
295-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
256+
<publishingServerId>sonatype-central-portal</publishingServerId>
257+
<autoPublish>true</autoPublish>
296258
</configuration>
297259
</plugin>
298260
</plugins>

0 commit comments

Comments
 (0)