Skip to content

Commit 87f3e66

Browse files
frantumafrantuma
committed
chore: migrate Sonatype OSSRH to Central Portal
1 parent af2d7e8 commit 87f3e66

File tree

12 files changed

+53
-104
lines changed

12 files changed

+53
-104
lines changed

‎.github/workflows/maven-pulls.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,18 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
java: [ 11, 14, 17 ]
13+
java: [ 11, 17 ]
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v4
1717
- name: Set up Java
18-
uses: actions/setup-java@v2
18+
uses: actions/setup-java@v4
1919
with:
2020
java-version: ${{ matrix.java }}
21-
distribution: 'zulu'
21+
distribution: temurin
22+
server-id: central
23+
server-username: MAVEN_USERNAME
24+
server-password: MAVEN_PASSWORD
2225
- name: Cache local Maven repository
2326
uses: actions/cache@v4
2427
with:

‎.github/workflows/maven.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
java: [ 11, 14, 17 ]
13+
java: [ 11 17 ]
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v4
1717
- name: Set up Java
18-
uses: actions/setup-java@v2
18+
uses: actions/setup-java@v4
1919
with:
2020
java-version: ${{ matrix.java }}
21-
distribution: 'zulu'
22-
server-id: ossrh
21+
distribution: 'temurin'
22+
server-id: central
2323
server-username: MAVEN_USERNAME
2424
server-password: MAVEN_PASSWORD
2525
- name: Cache local Maven repository
@@ -50,5 +50,5 @@ jobs:
5050
echo "not building and maven publishing project as it is a release version: " ${MY_JAVA_VERSION}
5151
fi
5252
env:
53-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
54-
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
53+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
54+
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}

‎.github/workflows/next-snapshot.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414
- uses: tibdex/github-app-token@v1
1515
id: generate-token
1616
with:
@@ -21,11 +21,11 @@ jobs:
2121
with:
2222
python-version: '3.10'
2323
- name: Set up Java 11
24-
uses: actions/setup-java@v2
24+
uses: actions/setup-java@v4
2525
with:
2626
java-version: 11
27-
distribution: 'zulu'
28-
server-id: ossrh
27+
distribution: 'temurin'
28+
server-id: central
2929
server-username: MAVEN_USERNAME
3030
server-password: MAVEN_PASSWORD
3131
- name: Cache local Maven repository
@@ -78,8 +78,8 @@ jobs:
7878

7979
env:
8080
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
81-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
82-
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
81+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
82+
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
8383
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8484
SC_VERSION:
8585
SC_NEXT_VERSION:

‎.github/workflows/prepare-release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414
- uses: tibdex/github-app-token@v1
1515
id: generate-token
1616
with:
@@ -21,11 +21,11 @@ jobs:
2121
with:
2222
python-version: '3.10'
2323
- name: Set up Java 11
24-
uses: actions/setup-java@v2
24+
uses: actions/setup-java@v4
2525
with:
2626
java-version: 11
27-
distribution: 'zulu'
28-
server-id: ossrh
27+
distribution: 'temurin'
28+
server-id: central
2929
server-username: MAVEN_USERNAME
3030
server-password: MAVEN_PASSWORD
3131
- name: Cache local Maven repository
@@ -59,8 +59,8 @@ jobs:
5959
branch: prepare-release-${{ env.SC_VERSION }}
6060
env:
6161
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
62-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
63-
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
62+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
63+
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
6464
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6565
SC_VERSION:
6666
SC_NEXT_VERSION:

‎.github/workflows/release.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414
- uses: tibdex/github-app-token@v1
1515
id: generate-token
1616
with:
@@ -21,13 +21,14 @@ jobs:
2121
with:
2222
python-version: '3.10'
2323
- name: Set up Java 11
24-
uses: actions/setup-java@v2
24+
uses: actions/setup-java@v4
2525
with:
2626
java-version: 11
27-
distribution: 'zulu'
28-
server-id: ossrh
27+
distribution: 'temurin'
28+
server-id: central
2929
server-username: MAVEN_USERNAME
3030
server-password: MAVEN_PASSWORD
31+
gpg-private-key: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }}
3132
- name: Cache local Maven repository
3233
uses: actions/cache@v4
3334
with:
@@ -57,15 +58,10 @@ jobs:
5758
git config --global user.name "GitHub Action"
5859
git config --global hub.protocol https
5960
git remote set-url origin https://\${{ secrets.GITHUB_TOKEN }}:[email protected]/swagger-api/swagger-parser.git
60-
- name: Run maven deploy/release (action-maven-publish)
61-
uses: samuelmeuli/action-maven-publish@v1
61+
- name: Run maven deploy/release
6262
if: env.RELEASE_OK == 'yes'
63-
with:
64-
gpg_private_key: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }}
65-
gpg_passphrase: ${{ secrets.OSSRH_GPG_PRIVATE_PASSPHRASE }}
66-
nexus_username: ${{ secrets.OSSRH_USERNAME }}
67-
nexus_password: ${{ secrets.OSSRH_TOKEN }}
68-
maven_profiles: "release"
63+
run: |
64+
./mvnw --no-transfer-progress -B -Prelease deploy
6965
- name: Run post release script
7066
id: postRelease
7167
if: env.RELEASE_OK == 'yes'
@@ -82,8 +78,8 @@ jobs:
8278

8379
env:
8480
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
85-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
86-
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
81+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
82+
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
8783
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8884
SC_VERSION:
8985
SC_NEXT_VERSION:

‎modules/swagger-parser-cli/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<artifactId>swagger-parser-cli</artifactId>
1414
<packaging>jar</packaging>
1515
<name>swagger-parser (executable)</name>
16-
16+
<description>swagger-parser (executable)</description>
1717
<build>
1818
<finalName>swagger-parser-cli</finalName>
1919
<resources>

‎modules/swagger-parser-core/pom.xml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,13 @@
99
<modelVersion>4.0.0</modelVersion>
1010
<artifactId>swagger-parser-core</artifactId>
1111
<packaging>jar</packaging>
12-
<name>swagger-parser</name>
12+
<name>swagger-parser-core</name>
13+
<description>swagger-parser-core</description>
1314
<dependencies>
1415
<dependency>
1516
<groupId>io.swagger.core.v3</groupId>
1617
<artifactId>swagger-models</artifactId>
1718
<version>${swagger-core-version}</version>
1819
</dependency>
1920
</dependencies>
20-
<repositories>
21-
<repository>
22-
<id>sonatype-snapshots</id>
23-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
24-
<snapshots>
25-
<enabled>true</enabled>
26-
</snapshots>
27-
</repository>
28-
</repositories>
2921
</project>

‎modules/swagger-parser-safe-url-resolver/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
</parent>
1313

1414
<artifactId>swagger-parser-safe-url-resolver</artifactId>
15-
15+
<name>swagger-parser-safe-url-resolver</name>
16+
<description>swagger-parser-safe-url-resolver</description>
1617
<dependencies>
1718
<dependency>
1819
<groupId>commons-io</groupId>

‎modules/swagger-parser-v2-converter/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<artifactId>swagger-parser-v2-converter</artifactId>
1111
<packaging>jar</packaging>
1212
<name>swagger-parser-v2-converter</name>
13+
<description>swagger-parser-v2-converter</description>
1314
<build>
1415
<plugins>
1516
<plugin>

‎modules/swagger-parser-v3/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<artifactId>swagger-parser-v3</artifactId>
1111
<packaging>jar</packaging>
1212
<name>swagger-parser-v3</name>
13+
<description>swagger-parser-v3</description>
1314
<dependencies>
1415
<dependency>
1516
<groupId>io.swagger.core.v3</groupId>

‎modules/swagger-parser/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<artifactId>swagger-parser</artifactId>
1111
<packaging>jar</packaging>
1212
<name>swagger-parser</name>
13-
13+
<description>swagger-parser</description>
1414
<dependencies>
1515
<dependency>
1616
<groupId>io.swagger.parser.v3</groupId>

‎pom.xml

Lines changed: 9 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<parent>
4-
<groupId>org.sonatype.oss</groupId>
5-
<artifactId>oss-parent</artifactId>
6-
<version>5</version>
7-
</parent>
83
<modelVersion>4.0.0</modelVersion>
94
<groupId>io.swagger.parser.v3</groupId>
105
<artifactId>swagger-parser-project</artifactId>
116
<version>2.1.28-SNAPSHOT</version>
127
<packaging>pom</packaging>
138
<name>swagger-parser-project</name>
9+
<description>swagger-parser-project</description>
10+
<url>https://github.com/swagger-api/swagger-core</url>
1411
<developers>
1512
<developer>
1613
<id>fehguy</id>
@@ -22,12 +19,6 @@
2219
<system>github</system>
2320
<url>https://github.com/swagger-api/swagger-parser/issues</url>
2421
</issueManagement>
25-
<mailingLists>
26-
<mailingList>
27-
<name>swagger-swaggersocket</name>
28-
<archive>https://groups.google.com/forum/#!forum/swagger-swaggersocket</archive>
29-
</mailingList>
30-
</mailingLists>
3122
<licenses>
3223
<license>
3324
<name>Apache License 2.0</name>
@@ -40,16 +31,6 @@
4031
<developerConnection>scm:git:[email protected]:swagger-api/swagger-parser.git</developerConnection>
4132
<url>https://github.com/swagger-api/swagger-parser</url>
4233
</scm>
43-
<distributionManagement>
44-
<snapshotRepository>
45-
<id>ossrh</id>
46-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
47-
</snapshotRepository>
48-
<repository>
49-
<id>ossrh</id>
50-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
51-
</repository>
52-
</distributionManagement>
5334
<build>
5435
<defaultGoal>install</defaultGoal>
5536
<resources>
@@ -232,18 +213,15 @@
232213
</executions>
233214
</plugin>
234215
<plugin>
235-
<groupId>org.sonatype.plugins</groupId>
236-
<artifactId>nexus-staging-maven-plugin</artifactId>
237-
<version>1.6.13</version>
216+
<groupId>org.sonatype.central</groupId>
217+
<artifactId>central-publishing-maven-plugin</artifactId>
218+
<version>0.7.0</version>
238219
<extensions>true</extensions>
239220
<configuration>
240-
<serverId>ossrh</serverId>
241-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
242-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
243-
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
244-
<!-- <skipStaging>true</skipStaging>
245-
<skipRemoteStaging>true</skipRemoteStaging>
246-
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>-->
221+
<publishingServerId>central</publishingServerId>
222+
<autoPublish>true</autoPublish>
223+
<waitUntil>published</waitUntil>
224+
<waitMaxTime>3600</waitMaxTime>
247225
</configuration>
248226
</plugin>
249227
</plugins>
@@ -388,28 +366,6 @@
388366
<module>modules/swagger-parser-cli</module>
389367
<module>modules/swagger-parser-safe-url-resolver</module>
390368
</modules>
391-
<repositories>
392-
<repository>
393-
<id>sonatype-snapshots</id>
394-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
395-
<snapshots>
396-
<enabled>true</enabled>
397-
</snapshots>
398-
<releases>
399-
<enabled>false</enabled>
400-
</releases>
401-
</repository>
402-
<repository>
403-
<id>sonatype-releases</id>
404-
<url>https://oss.sonatype.org/content/repositories/releases</url>
405-
<snapshots>
406-
<enabled>false</enabled>
407-
</snapshots>
408-
<releases>
409-
<enabled>true</enabled>
410-
</releases>
411-
</repository>
412-
</repositories>
413369
<properties>
414370
<maven.compiler.release>8</maven.compiler.release>
415371
<snakeyaml-version>2.4</snakeyaml-version>
@@ -427,6 +383,5 @@
427383
<jackson-version>2.18.3</jackson-version>
428384
<jackson-databind-version>2.18.3</jackson-databind-version>
429385
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
430-
<sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
431386
</properties>
432387
</project>

0 commit comments

Comments
 (0)