Skip to content

Commit dd5172c

Browse files
AB-xdevAB-xdev
authored
Merge pull request #74 from xdev-software/develop
Release
2 parents 2834dcf + dbb9e35 commit dd5172c

File tree

27 files changed

+110
-614
lines changed

27 files changed

+110
-614
lines changed

‎.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
@@ -119,28 +119,28 @@ jobs:
119119
git config --global user.name "GitHub Actions"
120120
git pull
121121
122-
- name: Set up JDK OSSRH
122+
- name: Set up JDK
123123
uses: actions/setup-java@v4
124124
with: # running setup-java again overwrites the settings.xml
125125
java-version: '17'
126126
distribution: 'temurin'
127-
server-id: ossrh
127+
server-id: sonatype-central-portal
128128
server-username: MAVEN_CENTRAL_USERNAME
129129
server-password: MAVEN_CENTRAL_TOKEN
130130
gpg-passphrase: MAVEN_GPG_PASSPHRASE
131131
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
132132

133-
- name: Publish to OSSRH
133+
- name: Publish to Central Portal
134134
run: |
135135
modules=("bom")
136136
dependency_management_block=$(grep -ozP '<dependencyManagement>(\r|\n|.)*<\/dependencyManagement>' 'bom/pom.xml' | tr -d '\0')
137137
modules+=($(echo $dependency_management_block | grep -oP '(?<=<artifactId>)[^<]+'))
138138
printf -v modules_joined '%s,' "${modules[@]}"
139139
modules_arg=$(echo "${modules_joined%,}")
140-
./mvnw -B deploy -pl "$modules_arg" -am -T2C -Possrh -DskipTests
140+
./mvnw -B deploy -pl "$modules_arg" -am -T2C -P publish-sonatype-central-portal -DskipTests
141141
env:
142-
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
143-
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
142+
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
143+
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}
144144
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
145145

146146
publish-pages:

‎.github/workflows/test-deploy.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,26 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v4
1212

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

24-
- name: Publish to OSSRH
24+
- name: Publish to Central Portal
2525
run: |
2626
modules=("bom")
2727
dependency_management_block=$(grep -ozP '<dependencyManagement>(\r|\n|.)*<\/dependencyManagement>' 'bom/pom.xml' | tr -d '\0')
2828
modules+=($(echo $dependency_management_block | grep -oP '(?<=<artifactId>)[^<]+'))
2929
printf -v modules_joined '%s,' "${modules[@]}"
3030
modules_arg=$(echo "${modules_joined%,}")
31-
./mvnw -B deploy -pl "$modules_arg" -am -T2C -Possrh -DskipTests
31+
./mvnw -B deploy -pl "$modules_arg" -am -T2C -P publish-sonatype-central-portal -DskipTests
3232
env:
33-
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
34-
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
33+
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
34+
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}
3535
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ vite.generated.ts
9393
.idea/*
9494
!.idea/saveactions_settings.xml
9595
!.idea/checkstyle-idea.xml
96+
!.idea/externalDependencies.xml
9697

9798
!.idea/inspectionProfiles/
9899
.idea/inspectionProfiles/*

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 1.0.5
2+
* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155)
3+
* Updated dependencies
4+
15
# 1.0.4
26
* OAuth2-OIDC
37
* ``DefaultDeAuthApplier``: Use already present request/response if possible

‎bom/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
<dependencyManagement>
8853
<dependencies>
8954
<dependency>
@@ -167,7 +132,7 @@
167132
</build>
168133
<profiles>
169134
<profile>
170-
<id>ossrh</id>
135+
<id>publish-sonatype-central-portal</id>
171136
<build>
172137
<plugins>
173138
<plugin>
@@ -211,16 +176,13 @@
211176
</plugin>
212177

213178
<plugin>
214-
<groupId>org.sonatype.plugins</groupId>
215-
<artifactId>nexus-staging-maven-plugin</artifactId>
216-
<version>1.7.0</version>
179+
<groupId>org.sonatype.central</groupId>
180+
<artifactId>central-publishing-maven-plugin</artifactId>
181+
<version>0.7.0</version>
217182
<extensions>true</extensions>
218183
<configuration>
219-
<serverId>ossrh</serverId>
220-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
221-
<!-- Sometimes OSSRH is really slow -->
222-
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
223-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
184+
<publishingServerId>sonatype-central-portal</publishingServerId>
185+
<autoPublish>true</autoPublish>
224186
</configuration>
225187
</plugin>
226188
</plugins>

‎client-storage/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
<dependency>
8954
<groupId>software.xdev.sse</groupId>
@@ -184,7 +149,7 @@
184149
</build>
185150
<profiles>
186151
<profile>
187-
<id>ossrh</id>
152+
<id>publish-sonatype-central-portal</id>
188153
<build>
189154
<plugins>
190155
<plugin>
@@ -228,16 +193,13 @@
228193
</plugin>
229194

230195
<plugin>
231-
<groupId>org.sonatype.plugins</groupId>
232-
<artifactId>nexus-staging-maven-plugin</artifactId>
233-
<version>1.7.0</version>
196+
<groupId>org.sonatype.central</groupId>
197+
<artifactId>central-publishing-maven-plugin</artifactId>
198+
<version>0.7.0</version>
234199
<extensions>true</extensions>
235200
<configuration>
236-
<serverId>ossrh</serverId>
237-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
238-
<!-- Sometimes OSSRH is really slow -->
239-
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
240-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
201+
<publishingServerId>sonatype-central-portal</publishingServerId>
202+
<autoPublish>true</autoPublish>
241203
</configuration>
242204
</plugin>
243205
</plugins>

‎codec-sha256/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
<dependency>
8954
<groupId>org.junit.jupiter</groupId>
@@ -191,7 +156,7 @@
191156
</build>
192157
<profiles>
193158
<profile>
194-
<id>ossrh</id>
159+
<id>publish-sonatype-central-portal</id>
195160
<build>
196161
<plugins>
197162
<plugin>
@@ -235,16 +200,13 @@
235200
</plugin>
236201

237202
<plugin>
238-
<groupId>org.sonatype.plugins</groupId>
239-
<artifactId>nexus-staging-maven-plugin</artifactId>
240-
<version>1.7.0</version>
203+
<groupId>org.sonatype.central</groupId>
204+
<artifactId>central-publishing-maven-plugin</artifactId>
205+
<version>0.7.0</version>
241206
<extensions>true</extensions>
242207
<configuration>
243-
<serverId>ossrh</serverId>
244-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
245-
<!-- Sometimes OSSRH is really slow -->
246-
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
247-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
208+
<publishingServerId>sonatype-central-portal</publishingServerId>
209+
<autoPublish>true</autoPublish>
248210
</configuration>
249211
</plugin>
250212
</plugins>

‎crypto-symmetric-managed/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
<dependencyManagement>
8853
<dependencies>
8954
<dependency>
@@ -211,7 +176,7 @@
211176
</build>
212177
<profiles>
213178
<profile>
214-
<id>ossrh</id>
179+
<id>publish-sonatype-central-portal</id>
215180
<build>
216181
<plugins>
217182
<plugin>
@@ -255,16 +220,13 @@
255220
</plugin>
256221

257222
<plugin>
258-
<groupId>org.sonatype.plugins</groupId>
259-
<artifactId>nexus-staging-maven-plugin</artifactId>
260-
<version>1.7.0</version>
223+
<groupId>org.sonatype.central</groupId>
224+
<artifactId>central-publishing-maven-plugin</artifactId>
225+
<version>0.7.0</version>
261226
<extensions>true</extensions>
262227
<configuration>
263-
<serverId>ossrh</serverId>
264-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
265-
<!-- Sometimes OSSRH is really slow -->
266-
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
267-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
228+
<publishingServerId>sonatype-central-portal</publishingServerId>
229+
<autoPublish>true</autoPublish>
268230
</configuration>
269231
</plugin>
270232
</plugins>

0 commit comments

Comments
 (0)