diff --git a/.github/workflows/maven-pulls.yml b/.github/workflows/maven-pulls.yml index c4e1edbb64..847110e2a9 100644 --- a/.github/workflows/maven-pulls.yml +++ b/.github/workflows/maven-pulls.yml @@ -10,15 +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@v2 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} - distribution: 'zulu' + 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 c259ff7833..5f447e59dc 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -10,16 +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@v2 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} - distribution: 'zulu' - server-id: ossrh + distribution: 'temurin' + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Cache local Maven repository @@ -50,5 +50,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/next-snapshot.yml b/.github/workflows/next-snapshot.yml index 4db72bcbf8..114b18f749 100644 --- a/.github/workflows/next-snapshot.yml +++ b/.github/workflows/next-snapshot.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,11 +21,11 @@ jobs: with: python-version: '3.10' - name: Set up Java 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: 11 - distribution: 'zulu' - server-id: ossrh + distribution: 'temurin' + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Cache local Maven repository @@ -78,8 +78,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/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index f09592211c..182f4ec957 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,11 +21,11 @@ jobs: with: python-version: '3.10' - name: Set up Java 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: 11 - distribution: 'zulu' - server-id: ossrh + distribution: 'temurin' + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - name: Cache local Maven repository @@ -59,8 +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 4208d0e3f9..13fabb3c4d 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,13 +21,14 @@ jobs: with: python-version: '3.10' - name: Set up Java 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: 11 - distribution: 'zulu' - server-id: ossrh + distribution: 'temurin' + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD + gpg-private-key: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }} - name: Cache local Maven repository uses: actions/cache@v4 with: @@ -57,15 +58,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" + run: | + ./mvnw --no-transfer-progress -B -Prelease deploy - name: Run post release script id: postRelease if: env.RELEASE_OK == 'yes' @@ -82,8 +78,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-parser-cli/pom.xml b/modules/swagger-parser-cli/pom.xml index cbbc3f7992..29799b4756 100644 --- a/modules/swagger-parser-cli/pom.xml +++ b/modules/swagger-parser-cli/pom.xml @@ -13,7 +13,7 @@ swagger-parser-cli jar swagger-parser (executable) - + swagger-parser (executable) swagger-parser-cli diff --git a/modules/swagger-parser-core/pom.xml b/modules/swagger-parser-core/pom.xml index 3ee9c1b462..0466bc65bc 100644 --- a/modules/swagger-parser-core/pom.xml +++ b/modules/swagger-parser-core/pom.xml @@ -9,7 +9,8 @@ 4.0.0 swagger-parser-core jar - swagger-parser + swagger-parser-core + swagger-parser-core io.swagger.core.v3 @@ -17,13 +18,4 @@ ${swagger-core-version} - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - - - diff --git a/modules/swagger-parser-safe-url-resolver/pom.xml b/modules/swagger-parser-safe-url-resolver/pom.xml index 056a2fe2d4..0e64d00c06 100644 --- a/modules/swagger-parser-safe-url-resolver/pom.xml +++ b/modules/swagger-parser-safe-url-resolver/pom.xml @@ -12,7 +12,8 @@ swagger-parser-safe-url-resolver - + swagger-parser-safe-url-resolver + swagger-parser-safe-url-resolver commons-io diff --git a/modules/swagger-parser-v2-converter/pom.xml b/modules/swagger-parser-v2-converter/pom.xml index a3ea09b6f6..e51d77f6a5 100644 --- a/modules/swagger-parser-v2-converter/pom.xml +++ b/modules/swagger-parser-v2-converter/pom.xml @@ -10,6 +10,7 @@ swagger-parser-v2-converter jar swagger-parser-v2-converter + swagger-parser-v2-converter diff --git a/modules/swagger-parser-v3/pom.xml b/modules/swagger-parser-v3/pom.xml index 0694e7c332..a69240e92e 100644 --- a/modules/swagger-parser-v3/pom.xml +++ b/modules/swagger-parser-v3/pom.xml @@ -10,6 +10,7 @@ swagger-parser-v3 jar swagger-parser-v3 + swagger-parser-v3 io.swagger.core.v3 diff --git a/modules/swagger-parser/pom.xml b/modules/swagger-parser/pom.xml index 2235ed05af..ceb14d5668 100644 --- a/modules/swagger-parser/pom.xml +++ b/modules/swagger-parser/pom.xml @@ -10,7 +10,7 @@ swagger-parser jar swagger-parser - + swagger-parser io.swagger.parser.v3 diff --git a/pom.xml b/pom.xml index 8a83c77018..cec291f80e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,16 +1,13 @@ - - org.sonatype.oss - oss-parent - 5 - 4.0.0 io.swagger.parser.v3 swagger-parser-project 2.1.28-SNAPSHOT pom swagger-parser-project + swagger-parser-project + https://github.com/swagger-api/swagger-core fehguy @@ -22,12 +19,6 @@ github https://github.com/swagger-api/swagger-parser/issues - - - swagger-swaggersocket - https://groups.google.com/forum/#!forum/swagger-swaggersocket - - Apache License 2.0 @@ -40,16 +31,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 @@ -232,18 +213,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 @@ -388,45 +366,22 @@ modules/swagger-parser-cli modules/swagger-parser-safe-url-resolver - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - - - false - - - - sonatype-releases - https://oss.sonatype.org/content/repositories/releases - - false - - - true - - - 8 2.4 - 1.0.73 - 2.18.0 + 1.0.75 + 2.19.0 2.0.9 2.2.32 - 1.6.15 + 1.6.16 4.13.2 7.11.0 1.49 2.35.2 3.2.2 3.17.0 - 2.18.3 - 2.18.3 + 2.19.0 + 2.19.0 UTF-8 - https://oss.sonatype.org/content/repositories/snapshots/