diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9cfa9ca..deee15a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,8 +56,8 @@ jobs: - name: Publish Maven run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -PremoveSnapshotSuffix env: - OSSRH_USERNAME: ${{ secrets.SONATYPE_OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.SONATYPE_OSSRH_PASSWORD }} + SONATYPE_PORTAL_USERNAME: ${{ secrets.SONATYPE_PORTAL_USERNAME }} + SONATYPE_PORTAL_PASSWORD: ${{ secrets.SONATYPE_PORTAL_PASSWORD }} SIGNING_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }} SIGNING_PASSWORD: ${{ secrets.PGP_PASSPHRASE }} diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 4dee949..60a2bc0 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -45,5 +45,5 @@ jobs: - name: Publish Maven Snapshot run: ./gradlew publishToSonatype env: - OSSRH_USERNAME: ${{ secrets.SONATYPE_OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.SONATYPE_OSSRH_PASSWORD }} + SONATYPE_PORTAL_USERNAME: ${{ secrets.SONATYPE_PORTAL_USERNAME }} + SONATYPE_PORTAL_PASSWORD: ${{ secrets.SONATYPE_PORTAL_PASSWORD }} diff --git a/build.gradle.kts b/build.gradle.kts index c1a6be2..57df513 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ repositories { mavenCentral() } -version = "1.1.10-SNAPSHOT" +version = "1.1.11-SNAPSHOT" group = "org.hisp.dhis.lib.expression" if (project.hasProperty("removeSnapshotSuffix")) { diff --git a/buildSrc/src/main/kotlin/maven-publish-conventions.gradle.kts b/buildSrc/src/main/kotlin/maven-publish-conventions.gradle.kts index 77b4f4c..8ce1433 100644 --- a/buildSrc/src/main/kotlin/maven-publish-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/maven-publish-conventions.gradle.kts @@ -5,8 +5,8 @@ plugins { id("org.jetbrains.dokka") } -val ossrhUsername: String? = System.getenv("OSSRH_USERNAME") -val ossrhPassword: String? = System.getenv("OSSRH_PASSWORD") +val centralPortalUsername: String? = System.getenv("SONATYPE_PORTAL_USERNAME") +val centralPortalPassword: String? = System.getenv("SONATYPE_PORTAL_PASSWORD") val signingPrivateKey: String? = System.getenv("SIGNING_PRIVATE_KEY") val signingPassword: String? = System.getenv("SIGNING_PASSWORD") @@ -59,8 +59,10 @@ publishing { nexusPublishing { this.repositories { sonatype { - username.set(ossrhUsername) - password.set(ossrhPassword) + nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/")) + snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/")) + username.set(centralPortalUsername) + password.set(centralPortalPassword) } } }