Skip to content

Commit d9ee6ec

Browse files
frantumafrantuma
committed
migrate Sonatype OSSRH to Central Portal
1 parent 1ad9544 commit d9ee6ec

File tree

9 files changed

+35
-69
lines changed

9 files changed

+35
-69
lines changed

‎.github/workflows/maven-v1-pulls.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@ jobs:
1212
java: [ "8" ]
1313

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

‎.github/workflows/maven-v1.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
java: [ 8 ]
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v4
1717
- name: Set up Java
1818
uses: actions/setup-java@v4
1919
with:
2020
java-version: ${{ matrix.java }}
21-
server-id: ossrh
21+
server-id: central
2222
server-username: MAVEN_USERNAME
2323
server-password: MAVEN_PASSWORD
2424
distribution: 'temurin'
@@ -49,5 +49,5 @@ jobs:
4949
echo "not deploying on java version: " ${MY_JAVA_VERSION}
5050
fi
5151
env:
52-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
53-
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
52+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
53+
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}

‎.github/workflows/next-snapshot-v1.yml‎

Lines changed: 4 additions & 4 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:
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/setup-java@v4
2525
with:
2626
java-version: 11
27-
server-id: ossrh
27+
server-id: central
2828
server-username: MAVEN_USERNAME
2929
server-password: MAVEN_PASSWORD
3030
distribution: 'temurin'
@@ -84,5 +84,5 @@ jobs:
8484
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8585
SC_VERSION:
8686
SC_NEXT_VERSION:
87-
GPG_PRIVATE_KEY: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }}
88-
GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PRIVATE_PASSPHRASE }}
87+
GPG_PRIVATE_KEY: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
88+
GPG_PASSPHRASE: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}

‎.github/workflows/prepare-release-v1.yml‎

Lines changed: 4 additions & 4 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:
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/setup-java@v4
2525
with:
2626
java-version: 8
27-
server-id: ossrh
27+
server-id: central
2828
server-username: MAVEN_USERNAME
2929
server-password: MAVEN_PASSWORD
3030
distribution: 'temurin'
@@ -60,8 +60,8 @@ jobs:
6060
branch: prepare-release-${{ env.SC_VERSION }}
6161
env:
6262
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
63-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
64-
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
63+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
64+
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
6565
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6666
SC_VERSION:
6767
SC_NEXT_VERSION:

‎.github/workflows/release-v1.yml‎

Lines changed: 8 additions & 13 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:
@@ -24,10 +24,11 @@ jobs:
2424
uses: actions/setup-java@v4
2525
with:
2626
java-version: 8
27-
server-id: ossrh
27+
server-id: central
2828
server-username: MAVEN_USERNAME
2929
server-password: MAVEN_PASSWORD
3030
distribution: 'temurin'
31+
gpg-private-key: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }}
3132
- name: Cache local Maven repository
3233
uses: actions/cache@v4
3334
with:
@@ -58,16 +59,10 @@ jobs:
5859
git config --global user.name "GitHub Action"
5960
git config --global hub.protocol https
6061
git remote set-url origin https://\${{ secrets.GITHUB_TOKEN }}:[email protected]/swagger-api/swagger-parser.git
61-
- name: Run maven deploy/release (action-maven-publish)
62-
uses: samuelmeuli/action-maven-publish@v1
62+
- name: Run maven deploy/release
6363
if: env.RELEASE_OK == 'yes'
64-
with:
65-
gpg_private_key: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }}
66-
gpg_passphrase: ${{ secrets.OSSRH_GPG_PRIVATE_PASSPHRASE }}
67-
nexus_username: ${{ secrets.OSSRH_USERNAME }}
68-
nexus_password: ${{ secrets.OSSRH_TOKEN }}
69-
maven_profiles: "release"
70-
maven_args: "-DskipTests"
64+
run: |
65+
./mvnw -DskipTests --no-transfer-progress -B -Prelease deploy
7166
- name: Run post release script
7267
id: postRelease
7368
if: env.RELEASE_OK == 'yes'
@@ -84,8 +79,8 @@ jobs:
8479

8580
env:
8681
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
87-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
88-
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
82+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
83+
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
8984
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9085
SC_VERSION:
9186
SC_NEXT_VERSION:

‎modules/swagger-compat-spec-parser/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<artifactId>swagger-compat-spec-parser</artifactId>
1313
<packaging>jar</packaging>
1414
<name>swagger-compat-spec-parser</name>
15+
<description>swagger-compat-spec-parser</description>
1516
<dependencies>
1617
<dependency>
1718
<groupId>io.swagger</groupId>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<artifactId>swagger-parser-safe-url-resolver</artifactId>
1313
<packaging>jar</packaging>
1414
<name>swagger-parser-safe-url-resolver</name>
15+
<description>swagger-parser-safe-url-resolver</description>
1516
<dependencies>
1617
<dependency>
1718
<groupId>commons-io</groupId>

‎modules/swagger-parser/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<artifactId>swagger-parser</artifactId>
1212
<packaging>jar</packaging>
1313
<name>swagger-parser</name>
14+
<description>swagger-parser</description>
1415
<profiles>
1516
<profile>
1617
<id>test-single</id>

‎pom.xml‎

Lines changed: 8 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<version>1.0.75-SNAPSHOT</version>
1313
<packaging>pom</packaging>
1414
<name>swagger-parser-project</name>
15+
<description>swagger-parser-project</description>
1516
<developers>
1617
<developer>
1718
<id>fehguy</id>
@@ -51,16 +52,6 @@
5152
<developerConnection>scm:git:[email protected]:swagger-api/swagger-parser.git</developerConnection>
5253
<url>https://github.com/swagger-api/swagger-parser</url>
5354
</scm>
54-
<distributionManagement>
55-
<snapshotRepository>
56-
<id>ossrh</id>
57-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
58-
</snapshotRepository>
59-
<repository>
60-
<id>ossrh</id>
61-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
62-
</repository>
63-
</distributionManagement>
6455
<build>
6556
<defaultGoal>install</defaultGoal>
6657
<resources>
@@ -226,18 +217,15 @@
226217
</executions>
227218
</plugin>
228219
<plugin>
229-
<groupId>org.sonatype.plugins</groupId>
230-
<artifactId>nexus-staging-maven-plugin</artifactId>
231-
<version>1.6.13</version>
220+
<groupId>org.sonatype.central</groupId>
221+
<artifactId>central-publishing-maven-plugin</artifactId>
222+
<version>0.7.0</version>
232223
<extensions>true</extensions>
233224
<configuration>
234-
<serverId>ossrh</serverId>
235-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
236-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
237-
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
238-
<!-- <skipStaging>true</skipStaging>
239-
<skipRemoteStaging>true</skipRemoteStaging>
240-
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>-->
225+
<publishingServerId>central</publishingServerId>
226+
<autoPublish>true</autoPublish>
227+
<waitUntil>published</waitUntil>
228+
<waitMaxTime>3600</waitMaxTime>
241229
</configuration>
242230
</plugin>
243231
</plugins>
@@ -369,28 +357,6 @@
369357
<module>modules/swagger-parser</module>
370358
<module>modules/swagger-compat-spec-parser</module>
371359
</modules>
372-
<repositories>
373-
<repository>
374-
<id>sonatype-snapshots</id>
375-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
376-
<snapshots>
377-
<enabled>true</enabled>
378-
</snapshots>
379-
<releases>
380-
<enabled>false</enabled>
381-
</releases>
382-
</repository>
383-
<repository>
384-
<id>sonatype-releases</id>
385-
<url>https://oss.sonatype.org/content/repositories/releases</url>
386-
<snapshots>
387-
<enabled>false</enabled>
388-
</snapshots>
389-
<releases>
390-
<enabled>true</enabled>
391-
</releases>
392-
</repository>
393-
</repositories>
394360
<properties>
395361
<!--<maven.compiler.release>8</maven.compiler.release>-->
396362
<commons-io-version>2.15.1</commons-io-version>
@@ -403,6 +369,5 @@
403369
<wiremock-version>2.27.2</wiremock-version>
404370
<surefire-version>2.22.2</surefire-version>
405371
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
406-
<sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
407372
</properties>
408373
</project>

0 commit comments

Comments
 (0)