diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fecd74b..ac156e6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -69,16 +69,14 @@ jobs: gpg-passphrase: GPG_PASSWORD - name: Setup Gradle - uses: gradle/gradle-build-action@v3 - # Note: the action recommends to switch to gradle/actions/setup-gradle@v3 - # but this change makes the publish task fail at initialization of stating repository. + uses: gradle/actions/setup-gradle@v6 - name: Publish DDI Lifecycle lib on Maven Central run: | - ./gradlew clean :model:publishToSonatype closeAndReleaseSonatypeStagingRepository + ./gradlew clean :model:publishToSonatype closeAndReleaseSonatypeStagingRepository --info env: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + OSSRH_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.MAVEN_CENTRAL_TOKEN }} GPG_SIGNING_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} GPG_PASSWORD: ${{ secrets.MAVEN_GPG_PASSPHRASE }} diff --git a/.github/workflows/snapshot.yaml b/.github/workflows/snapshot.yaml index 0526bcf..e33b726 100644 --- a/.github/workflows/snapshot.yaml +++ b/.github/workflows/snapshot.yaml @@ -24,9 +24,7 @@ jobs: java-version: ${{ env.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/gradle-build-action@v3 - # Note: the action recommends to switch to gradle/actions/setup-gradle@v3 - # but this change makes the publish task fail at initialization of stating repository. + uses: gradle/actions/setup-gradle@v6 - name: Get DDI-Lifecycle lib version id: version-step @@ -73,8 +71,8 @@ jobs: run: | ./gradlew clean :model:publishToSonatype env: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + OSSRH_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.MAVEN_CENTRAL_TOKEN }} write-comment: needs: [check-version, publish-snapshot] diff --git a/build.gradle.kts b/build.gradle.kts index 5b3ae88..65460b6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,8 +18,9 @@ tasks.register("printVersion") { nexusPublishing { repositories { sonatype { - nexusUrl.set(uri("https://oss.sonatype.org/service/local/")) - snapshotRepositoryUrl.set(uri("https://oss.sonatype.org/content/repositories/snapshots/")) + // https://central.sonatype.org/publish/publish-portal-ossrh-staging-api/#configuring-your-plugin + nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/")) + snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/")) val mavenUserProp = System.getenv("OSSRH_USERNAME") ?: findProperty("ossrh.username") val mavenPwdProp = System.getenv("OSSRH_PASSWORD") ?: findProperty("ossrh.password")