diff --git a/.github/workflows/maven-v1-pulls.yml b/.github/workflows/maven-v1-pulls.yml index 9bb2b8af5d..81f4dcdb15 100644 --- a/.github/workflows/maven-v1-pulls.yml +++ b/.github/workflows/maven-v1-pulls.yml @@ -12,12 +12,15 @@ jobs: java: [ "8" ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Java 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-v1.yml b/.github/workflows/maven-v1.yml index d8f67e8efb..d79d0d52cf 100644 --- a/.github/workflows/maven-v1.yml +++ b/.github/workflows/maven-v1.yml @@ -13,12 +13,12 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Java uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} - server-id: ossrh + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD distribution: 'temurin' @@ -49,5 +49,5 @@ jobs: echo "not deploying on java 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/next-snapshot-v1.yml b/.github/workflows/next-snapshot-v1.yml index 470d231ef6..f3f5bdc415 100644 --- a/.github/workflows/next-snapshot-v1.yml +++ b/.github/workflows/next-snapshot-v1.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: @@ -24,7 +24,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: 11 - server-id: ossrh + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD distribution: 'temurin' @@ -84,5 +84,5 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} SC_VERSION: SC_NEXT_VERSION: - GPG_PRIVATE_KEY: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }} - GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PRIVATE_PASSPHRASE }} + GPG_PRIVATE_KEY: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + GPG_PASSPHRASE: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} diff --git a/.github/workflows/prepare-release-v1.yml b/.github/workflows/prepare-release-v1.yml index f016a01ec6..94349dcdf2 100644 --- a/.github/workflows/prepare-release-v1.yml +++ b/.github/workflows/prepare-release-v1.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: @@ -24,7 +24,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: 8 - server-id: ossrh + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD distribution: 'temurin' @@ -60,8 +60,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-v1.yml b/.github/workflows/release-v1.yml index d86c794bf6..7f512e8411 100644 --- a/.github/workflows/release-v1.yml +++ b/.github/workflows/release-v1.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: @@ -24,10 +24,11 @@ jobs: uses: actions/setup-java@v4 with: java-version: 8 - server-id: ossrh + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD distribution: 'temurin' + gpg-private-key: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }} - name: Cache local Maven repository uses: actions/cache@v4 with: @@ -58,16 +59,10 @@ 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-parser.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" - maven_args: "-DskipTests" + run: | + ./mvnw -DskipTests --no-transfer-progress -B -Prelease deploy - name: Run post release script id: postRelease if: env.RELEASE_OK == 'yes' @@ -84,8 +79,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/modules/swagger-compat-spec-parser/pom.xml b/modules/swagger-compat-spec-parser/pom.xml index 0d659a9074..2d3b79029f 100644 --- a/modules/swagger-compat-spec-parser/pom.xml +++ b/modules/swagger-compat-spec-parser/pom.xml @@ -12,6 +12,7 @@ swagger-compat-spec-parser jar swagger-compat-spec-parser + swagger-compat-spec-parser io.swagger diff --git a/modules/swagger-parser-safe-url-resolver/pom.xml b/modules/swagger-parser-safe-url-resolver/pom.xml index af401b6cb2..4cb92ce209 100644 --- a/modules/swagger-parser-safe-url-resolver/pom.xml +++ b/modules/swagger-parser-safe-url-resolver/pom.xml @@ -12,6 +12,7 @@ swagger-parser-safe-url-resolver jar swagger-parser-safe-url-resolver + swagger-parser-safe-url-resolver commons-io diff --git a/modules/swagger-parser/pom.xml b/modules/swagger-parser/pom.xml index 24568db915..8a1ce3c3d5 100644 --- a/modules/swagger-parser/pom.xml +++ b/modules/swagger-parser/pom.xml @@ -11,6 +11,7 @@ swagger-parser jar swagger-parser + swagger-parser test-single diff --git a/pom.xml b/pom.xml index 530336de8a..54843c64d9 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,7 @@ 1.0.75-SNAPSHOT pom swagger-parser-project + swagger-parser-project fehguy @@ -51,16 +52,6 @@ scm:git:git@github.com:swagger-api/swagger-parser.git https://github.com/swagger-api/swagger-parser - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - install @@ -226,18 +217,15 @@ - 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 + 3600 @@ -369,28 +357,6 @@ modules/swagger-parser modules/swagger-compat-spec-parser - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - - - false - - - - sonatype-releases - https://oss.sonatype.org/content/repositories/releases - - false - - - true - - - 2.15.1 @@ -403,6 +369,5 @@ 2.27.2 2.22.2 UTF-8 - https://oss.sonatype.org/content/repositories/snapshots/