diff --git a/.github/workflows/maven-pulls.yml b/.github/workflows/maven-pulls.yml
index 7b31f5f3a8..d2a3f0d85c 100644
--- a/.github/workflows/maven-pulls.yml
+++ b/.github/workflows/maven-pulls.yml
@@ -10,14 +10,18 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [ 11, 14, 17 ]
+ java: [ 11, 17 ]
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
- name: Set up Java
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
+ distribution: temurin
+ server-id: central
+ server-username: MAVEN_USERNAME
+ server-password: MAVEN_PASSWORD
- name: Cache local Maven repository
uses: actions/cache@v4
with:
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 0b22bf4241..67d45a81e6 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -10,15 +10,16 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [ 11, 14, 17 ]
+ java: [ 11, 17 ]
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
- name: Set up Java
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
- server-id: ossrh
+ distribution: temurin
+ server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Cache local Maven repository
@@ -52,5 +53,5 @@ jobs:
echo "not building and maven publishing project as it is a release version: " ${MY_JAVA_VERSION}
fi
env:
- MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
- MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+ MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+ MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 1f3200c604..75742a8371 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
- uses: tibdex/github-app-token@v1
id: generate-token
with:
@@ -21,10 +21,11 @@ jobs:
with:
python-version: '3.10'
- name: Set up Java 11
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v4
with:
java-version: 11
- server-id: ossrh
+ distribution: temurin
+ server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Cache local Maven repository
@@ -58,9 +59,8 @@ jobs:
branch: prepare-release-${{ env.SC_VERSION }}
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
- MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
- MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+ MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+ MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SC_VERSION:
SC_NEXT_VERSION:
-
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 663fdcb98e..b02177d60c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
- uses: tibdex/github-app-token@v1
id: generate-token
with:
@@ -21,12 +21,15 @@ jobs:
with:
python-version: '3.10'
- name: Set up Java 11
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v4
with:
java-version: 11
- server-id: ossrh
+ distribution: temurin
+ server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
+ gpg-private-key: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }}
+ gpg-passphrase: ${{ secrets.OSSRH_GPG_PRIVATE_PASSPHRASE }}
- name: Cache local Maven repository
uses: actions/cache@v4
with:
@@ -60,22 +63,17 @@ jobs:
git config --global user.name "GitHub Action"
git config --global hub.protocol https
git remote set-url origin https://\${{ secrets.GITHUB_TOKEN }}:x-oauth-basic@github.com/''' + 'swagger-api/swagger-core' + '''.git
- - name: Run maven deploy/release (action-maven-publish)
- uses: samuelmeuli/action-maven-publish@v1
+ - name: Run maven deploy/release
if: env.RELEASE_OK == 'yes'
- with:
- gpg_private_key: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }}
- gpg_passphrase: ${{ secrets.OSSRH_GPG_PRIVATE_PASSPHRASE }}
- nexus_username: ${{ secrets.OSSRH_USERNAME }}
- nexus_password: ${{ secrets.OSSRH_TOKEN }}
- maven_profiles: "release"
+ run: |
+ ./mvnw --no-transfer-progress -B -Prelease deploy
- name: Run prepare javadocs script
id: prepareJavadocs
if: env.RELEASE_OK == 'yes'
run: |
. ./CI/prepare-javadocs.sh
- name: Checkout gh-pages
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
with:
ref: "gh-pages"
fetch-depth: 0
@@ -86,7 +84,7 @@ jobs:
TMPDIR="$(dirname -- "${0}")"
. $TMPDIR/publish-javadocs.sh
- name: Checkout master
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
with:
ref: "master"
fetch-depth: 0
@@ -104,7 +102,7 @@ jobs:
title: 'bump snapshot ${{ env.SC_NEXT_VERSION }}-SNAPSHOT'
branch: bump-snap-${{ env.SC_NEXT_VERSION }}-SNAPSHOT
- name: Checkout 1.5
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
with:
ref: "1.5"
fetch-depth: 0
@@ -123,7 +121,7 @@ jobs:
title: 'update 1.5 Readme with new v2 version ${{ env.SC_VERSION }}'
branch: update-v1-readme-${{ env.SC_VERSION }}
- name: Checkout Wiki
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
with:
repository: swagger-api/swagger-core.wiki
token: ${{ steps.generate-token.outputs.token }}
@@ -145,8 +143,8 @@ jobs:
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
- MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
- MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+ MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+ MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SC_VERSION:
SC_NEXT_VERSION:
diff --git a/CI/CI.md b/CI/CI.md
index f3749d68f0..808c3fee09 100644
--- a/CI/CI.md
+++ b/CI/CI.md
@@ -83,7 +83,7 @@ See also [here](https://github.com/peter-evans/create-pull-request/blob/master/d
GPG private key and passphrase defined to be used for sonatype deployments, as detailed in
https://central.sonatype.org/pages/working-with-pgp-signatures.html (I'd say with email matching the one of the sonatype account of point 1
-* `OSSRH_USERNAME` and `OSSRH_TOKEN`: sonatype user/token
+* `MAVEN_CENTRAL_USERNAME` and `MAVEN_CENTRAL_PASSWORD`: sonatype user/token
* `GRADLE_PUBLISH_KEY` and `GRADLE_PUBLISH_SECRET`: credentials for https://plugins.gradle.org/
diff --git a/modules/swagger-project-jakarta/pom.xml b/modules/swagger-project-jakarta/pom.xml
index 4ca2e3b75d..c3239f927d 100644
--- a/modules/swagger-project-jakarta/pom.xml
+++ b/modules/swagger-project-jakarta/pom.xml
@@ -13,16 +13,6 @@
scm:git:git@github.com:swagger-api/swagger-core.git
https://github.com/swagger-api/swagger-core
-
-
- ossrh
- https://oss.sonatype.org/content/repositories/snapshots
-
-
- ossrh
- https://oss.sonatype.org/service/local/staging/deploy/maven2/
-
-
2.2.0
@@ -112,18 +102,14 @@
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.13
+ org.sonatype.central
+ central-publishing-maven-plugin
+ 0.7.0
true
- ossrh
- https://oss.sonatype.org/
- true
- 30
-
+ central
+ true
+ published
@@ -509,7 +495,6 @@
0
UTF-8
- https://oss.sonatype.org/content/repositories/snapshots/
0.5.0
3.9.9
1.27.1
diff --git a/pom.xml b/pom.xml
index 9de6484794..20404e2b5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,16 +13,6 @@
scm:git:git@github.com:swagger-api/swagger-core.git
https://github.com/swagger-api/swagger-core
-
-
- ossrh
- https://oss.sonatype.org/content/repositories/snapshots
-
-
- ossrh
- https://oss.sonatype.org/service/local/staging/deploy/maven2/
-
-
2.2.0
@@ -208,18 +198,14 @@
3.12.1
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.13
+ org.sonatype.central
+ central-publishing-maven-plugin
+ 0.7.0
true
- ossrh
- https://oss.sonatype.org/
- true
- 30
-
+ central
+ true
+ published
@@ -666,6 +652,5 @@
0
0.5.0
UTF-8
- https://oss.sonatype.org/content/repositories/snapshots/