Skip to content

Commit 1cbef7d

Browse files
AB-xdevAB-xdev
authored
Merge pull request #221 from xdev-software/develop
Release
2 parents 5cfb7c6 + 13cd954 commit 1cbef7d

File tree

8 files changed

+40
-66
lines changed

8 files changed

+40
-66
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
@@ -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/*

‎.idea/externalDependencies.xml‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 1.2.7
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.2.6
26
* Updated dependencies
37

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>com.puppycrawl.tools</groupId>
4747
<artifactId>checkstyle</artifactId>
48-
<version>10.23.0</version>
48+
<version>10.23.1</version>
4949
</dependency>
5050
</dependencies>
5151
<configuration>
@@ -82,12 +82,12 @@
8282
<dependency>
8383
<groupId>net.sourceforge.pmd</groupId>
8484
<artifactId>pmd-core</artifactId>
85-
<version>7.12.0</version>
85+
<version>7.13.0</version>
8686
</dependency>
8787
<dependency>
8888
<groupId>net.sourceforge.pmd</groupId>
8989
<artifactId>pmd-java</artifactId>
90-
<version>7.12.0</version>
90+
<version>7.13.0</version>
9191
</dependency>
9292
</dependencies>
9393
</plugin>

‎sessionize-java-client/pom.xml‎

Lines changed: 12 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -56,47 +56,12 @@
5656
</sonar.exclusions>
5757
</properties>
5858

59-
<repositories>
60-
<!-- The order of definitions matters. Explicitly defining central here
61-
to make sure it has the highest priority. -->
62-
<repository>
63-
<id>central</id>
64-
<url>https://repo.maven.apache.org/maven2</url>
65-
<snapshots>
66-
<enabled>false</enabled>
67-
</snapshots>
68-
</repository>
69-
</repositories>
70-
71-
<pluginRepositories>
72-
<!-- The order of definitions matters. Explicitly defining central here
73-
to make sure it has the highest priority. -->
74-
<pluginRepository>
75-
<id>central</id>
76-
<url>https://repo.maven.apache.org/maven2</url>
77-
<snapshots>
78-
<enabled>false</enabled>
79-
</snapshots>
80-
</pluginRepository>
81-
</pluginRepositories>
82-
83-
<distributionManagement>
84-
<snapshotRepository>
85-
<id>ossrh</id>
86-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
87-
</snapshotRepository>
88-
<repository>
89-
<id>ossrh</id>
90-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
91-
</repository>
92-
</distributionManagement>
93-
9459
<dependencyManagement>
9560
<dependencies>
9661
<dependency>
9762
<groupId>com.fasterxml.jackson</groupId>
9863
<artifactId>jackson-bom</artifactId>
99-
<version>2.18.3</version>
64+
<version>2.19.0</version>
10065
<type>pom</type>
10166
<scope>import</scope>
10267
</dependency>
@@ -108,7 +73,7 @@
10873
<dependency>
10974
<groupId>org.apache.httpcomponents.client5</groupId>
11075
<artifactId>httpclient5</artifactId>
111-
<version>5.4.3</version>
76+
<version>5.4.4</version>
11277
</dependency>
11378

11479
<!-- JSON processing: jackson -->
@@ -252,7 +217,7 @@
252217
</build>
253218
<profiles>
254219
<profile>
255-
<id>ossrh</id>
220+
<id>publish-sonatype-central-portal</id>
256221
<build>
257222
<plugins>
258223
<plugin>
@@ -296,16 +261,13 @@
296261
</plugin>
297262

298263
<plugin>
299-
<groupId>org.sonatype.plugins</groupId>
300-
<artifactId>nexus-staging-maven-plugin</artifactId>
301-
<version>1.7.0</version>
264+
<groupId>org.sonatype.central</groupId>
265+
<artifactId>central-publishing-maven-plugin</artifactId>
266+
<version>0.7.0</version>
302267
<extensions>true</extensions>
303268
<configuration>
304-
<serverId>ossrh</serverId>
305-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
306-
<!-- Sometimes OSSRH is really slow -->
307-
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
308-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
269+
<publishingServerId>sonatype-central-portal</publishingServerId>
270+
<autoPublish>true</autoPublish>
309271
</configuration>
310272
</plugin>
311273
</plugins>
@@ -356,7 +318,7 @@
356318
<plugin>
357319
<groupId>org.openapitools</groupId>
358320
<artifactId>openapi-generator-maven-plugin</artifactId>
359-
<version>7.12.0</version>
321+
<version>7.13.0</version>
360322
<executions>
361323
<execution>
362324
<goals>
@@ -481,7 +443,7 @@
481443
<dependency>
482444
<groupId>com.puppycrawl.tools</groupId>
483445
<artifactId>checkstyle</artifactId>
484-
<version>10.23.0</version>
446+
<version>10.23.1</version>
485447
</dependency>
486448
</dependencies>
487449
<configuration>
@@ -522,12 +484,12 @@
522484
<dependency>
523485
<groupId>net.sourceforge.pmd</groupId>
524486
<artifactId>pmd-core</artifactId>
525-
<version>7.12.0</version>
487+
<version>7.13.0</version>
526488
</dependency>
527489
<dependency>
528490
<groupId>net.sourceforge.pmd</groupId>
529491
<artifactId>pmd-java</artifactId>
530-
<version>7.12.0</version>
492+
<version>7.13.0</version>
531493
</dependency>
532494
</dependencies>
533495
</plugin>

0 commit comments

Comments
 (0)