From 913f1c4b545c8d4f2f8e50b916e3564b59638a89 Mon Sep 17 00:00:00 2001 From: Victor Garcia Date: Tue, 24 Jun 2025 09:55:57 +0200 Subject: [PATCH 1/3] Adapt to Sonatype Central Publisher Portal --- .github/workflows/main.yml | 4 ++-- .github/workflows/pull_request.yml | 4 ++-- .../main/kotlin/maven-publish-conventions.gradle.kts | 10 ++++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9cfa9ca..7de0dec 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 }} + CENTRAL_PORTAL_USERNAME: ${{ secrets.SONATYPE_OSSRH_USERNAME }} + CENTRAL_PORTAL_PASSWORD: ${{ secrets.SONATYPE_OSSRH_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..c61d6da 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 }} + CENTRAL_PORTAL_USERNAME: ${{ secrets.SONATYPE_OSSRH_USERNAME }} + CENTRAL_PORTAL_PASSWORD: ${{ secrets.SONATYPE_OSSRH_PASSWORD }} diff --git a/buildSrc/src/main/kotlin/maven-publish-conventions.gradle.kts b/buildSrc/src/main/kotlin/maven-publish-conventions.gradle.kts index 77b4f4c..ab6e438 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("CENTRAL_PORTAL_USERNAME") +val centralPortalPassword: String? = System.getenv("CENTRAL_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) } } } From eaf54456ca159cc7880a23f74d9a8aa82ebd7325 Mon Sep 17 00:00:00 2001 From: Victor Garcia Date: Tue, 24 Jun 2025 09:56:54 +0200 Subject: [PATCH 2/3] Version 1.1.11-SNAPSHOT --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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")) { From c1a1714dbed148ff41e0485a81193a5b3e651069 Mon Sep 17 00:00:00 2001 From: Victor Garcia Date: Tue, 24 Jun 2025 10:27:20 +0200 Subject: [PATCH 3/3] Update secrets name --- .github/workflows/main.yml | 4 ++-- .github/workflows/pull_request.yml | 4 ++-- buildSrc/src/main/kotlin/maven-publish-conventions.gradle.kts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7de0dec..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: - CENTRAL_PORTAL_USERNAME: ${{ secrets.SONATYPE_OSSRH_USERNAME }} - CENTRAL_PORTAL_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 c61d6da..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: - CENTRAL_PORTAL_USERNAME: ${{ secrets.SONATYPE_OSSRH_USERNAME }} - CENTRAL_PORTAL_PASSWORD: ${{ secrets.SONATYPE_OSSRH_PASSWORD }} + SONATYPE_PORTAL_USERNAME: ${{ secrets.SONATYPE_PORTAL_USERNAME }} + SONATYPE_PORTAL_PASSWORD: ${{ secrets.SONATYPE_PORTAL_PASSWORD }} diff --git a/buildSrc/src/main/kotlin/maven-publish-conventions.gradle.kts b/buildSrc/src/main/kotlin/maven-publish-conventions.gradle.kts index ab6e438..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 centralPortalUsername: String? = System.getenv("CENTRAL_PORTAL_USERNAME") -val centralPortalPassword: String? = System.getenv("CENTRAL_PORTAL_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")