From a460f965d4f366a77caebfebe1a3a0970cb283f7 Mon Sep 17 00:00:00 2001 From: Sangamesh Vijaykumar Date: Thu, 8 Jan 2026 14:41:12 +0530 Subject: [PATCH 1/7] Migrate from OSSRH to Maven Central Publishing API - Update nexusPublishing configuration to use new Maven Central endpoints - Change repository name from OSSRH to sonatype - Update CI workflow to use new task names (publishToSonatype) - Update credential environment variable names for Maven Central --- .github/workflows/ci.yml | 8 ++++---- build.gradle | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc47808..263008d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,14 +27,14 @@ jobs: - name: Build run: ./gradlew build - - name: Publish to OSSRH + - name: Publish to Maven Central if: github.ref == 'refs/heads/main' - run: ./gradlew publishToOSSRH closeAndReleaseOSSRHStagingRepository -PisReleaseVersion=${{ env.DO_RELEASE }} + run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -PisReleaseVersion=${{ env.DO_RELEASE }} env: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.OSSRH_GPG_SECRET_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.OSSRH_GPG_SECRET_KEY_PWD }} - ORG_GRADLE_PROJECT_OSSRHUsername: ${{ secrets.OSSRH_USER_NAME }} - ORG_GRADLE_PROJECT_OSSRHPassword: ${{ secrets.OSSRH_PASSWORD }} + ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} - name: Prepare release PR uses: GoogleCloudPlatform/release-please-action@v2 diff --git a/build.gradle b/build.gradle index dfa2cc5..2250314 100644 --- a/build.gradle +++ b/build.gradle @@ -24,12 +24,12 @@ ext { version = latestReleaseVersion+versionSuffix nexusPublishing { - repositories { - OSSRH { - nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) - snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) - } - } + repositories { + sonatype { + nexusUrl.set(uri("https://central.sonatype.com/api/v1/publisher/")) + snapshotRepositoryUrl.set(uri("https://central.sonatype.com/api/v1/publisher/")) + } + } } allprojects { @@ -85,7 +85,7 @@ allprojects { def signingKey = findProperty("signingKey") def signingPassword = findProperty("signingPassword") useInMemoryPgpKeys(signingKey, signingPassword) - required { gradle.taskGraph.hasTask("publishToOSSRH") } + required { gradle.taskGraph.hasTask("publishToSonatype") } sign publishing.publications.mavenJava } } From eb6c2e8b2345af3e481c8272b0c94a3e0cfffff0 Mon Sep 17 00:00:00 2001 From: Sangamesh Vijaykumar Date: Thu, 8 Jan 2026 15:31:00 +0530 Subject: [PATCH 2/7] Trying to push snapshot version to maven central for testing purpose only --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 263008d..42a6cdf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: run: ./gradlew build - name: Publish to Maven Central - if: github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/migrate-to-maven-central' run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -PisReleaseVersion=${{ env.DO_RELEASE }} env: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.OSSRH_GPG_SECRET_KEY }} From 46b4bbd360b293f04194d1f56e73c2a4fb36ff5f Mon Sep 17 00:00:00 2001 From: Sangamesh Vijaykumar Date: Thu, 8 Jan 2026 15:38:33 +0530 Subject: [PATCH 3/7] Trying to push snapshot version to maven central for testing purpose only --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 2250314..cf7c9a0 100644 --- a/build.gradle +++ b/build.gradle @@ -26,8 +26,8 @@ version = latestReleaseVersion+versionSuffix nexusPublishing { repositories { sonatype { - nexusUrl.set(uri("https://central.sonatype.com/api/v1/publisher/")) - snapshotRepositoryUrl.set(uri("https://central.sonatype.com/api/v1/publisher/")) + nexusUrl.set(uri("https://central.sonatype.com/")) + snapshotRepositoryUrl.set(uri("https://central.sonatype.com/")) } } } From 304b547125f6f617ed1927424f162d15d4ed1af1 Mon Sep 17 00:00:00 2001 From: Sangamesh Vijaykumar Date: Thu, 8 Jan 2026 15:46:01 +0530 Subject: [PATCH 4/7] Trying to push snapshot version to maven central for testing purpose only --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index cf7c9a0..52c8b88 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'signing' id 'base' id 'io.freefair.lombok' version '8.11' apply false - id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' + id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' } description = 'Utility classes for working with the REST API interfaces provided by the various Fortify products' @@ -26,8 +26,8 @@ version = latestReleaseVersion+versionSuffix nexusPublishing { repositories { sonatype { - nexusUrl.set(uri("https://central.sonatype.com/")) - snapshotRepositoryUrl.set(uri("https://central.sonatype.com/")) + nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/")) + snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/")) } } } From 6e1f06d6da9d0dbfbe226b6ec078f3052ee87ffe Mon Sep 17 00:00:00 2001 From: Sangamesh Vijaykumar Date: Thu, 8 Jan 2026 15:49:41 +0530 Subject: [PATCH 5/7] Trying to push snapshot version to maven central for testing purpose only --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42a6cdf..82e711c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: env: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.OSSRH_GPG_SECRET_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.OSSRH_GPG_SECRET_KEY_PWD }} - ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.MAVEN_CENTRAL_USER }} ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} - name: Prepare release PR From 5d5505b5601e775cd7847c23904c8f34b875d075 Mon Sep 17 00:00:00 2001 From: Sangamesh Vijaykumar Date: Fri, 16 Jan 2026 14:13:26 +0530 Subject: [PATCH 6/7] Bumped-up the dependency libraries versions along with version upgrade for fortify-client-api --- common-rest/build.gradle | 6 +++--- fortify-client-api-bom/build.gradle | 10 +++++----- version.txt | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common-rest/build.gradle b/common-rest/build.gradle index b7868a6..bd5bf68 100644 --- a/common-rest/build.gradle +++ b/common-rest/build.gradle @@ -25,8 +25,8 @@ dependencies { implementation 'commons-lang:commons-lang' implementation 'commons-logging:commons-logging' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2' - testImplementation 'org.junit.platform:junit-platform-launcher:1.9.2' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.4' + testImplementation 'org.junit.platform:junit-platform-launcher:1.11.4' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.4' } diff --git a/fortify-client-api-bom/build.gradle b/fortify-client-api-bom/build.gradle index aa62d7a..7ba2c91 100644 --- a/fortify-client-api-bom/build.gradle +++ b/fortify-client-api-bom/build.gradle @@ -9,10 +9,10 @@ javaPlatform { } dependencies { - api platform('com.fasterxml.jackson:jackson-bom:2.19.4') - api platform('org.glassfish.jersey:jersey-bom:2.42') + api platform('com.fasterxml.jackson:jackson-bom:2.20.1') + api platform('org.glassfish.jersey:jersey-bom:2.47') api platform('org.apache.logging.log4j:log4j-bom:2.25.3') - api platform('org.springframework:spring-framework-bom:5.3.33') + api platform('org.springframework:spring-framework-bom:5.3.39') constraints { api "org.apache.httpcomponents:httpcore:4.4.16" @@ -20,10 +20,10 @@ dependencies { api "jakarta.ws.rs:jakarta.ws.rs-api:2.1.6" api "commons-lang:commons-lang:2.6" - api "commons-beanutils:commons-beanutils:1.9.4" + api "commons-beanutils:commons-beanutils:1.10.0" api "commons-codec:commons-codec:1.20.0" api "commons-collections:commons-collections:3.2.2" - api "commons-logging:commons-logging:1.3.0" + api "commons-logging:commons-logging:1.3.4" api "com.fortify.client.api:common-log:${project.version}" api "com.fortify.client.api:common-spring:${project.version}" diff --git a/version.txt b/version.txt index 1dd8be0..2597c99 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -6.1.8 +6.1.9 From 24f69bd3739a33ce90bd05f5abf6006560d9e2d1 Mon Sep 17 00:00:00 2001 From: "Sangamesh V." <60685551+SangameshV@users.noreply.github.com> Date: Fri, 16 Jan 2026 14:17:21 +0530 Subject: [PATCH 7/7] Change publish branch condition to main For testing purposes, the publish branch was temporarily set to a personal feature branch. It is now being reverted back to the `main` as before. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82e711c..6637347 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: run: ./gradlew build - name: Publish to Maven Central - if: github.ref == 'refs/heads/migrate-to-maven-central' + if: github.ref == 'refs/heads/main' run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -PisReleaseVersion=${{ env.DO_RELEASE }} env: ORG_GRADLE_PROJECT_signingKey: ${{ secrets.OSSRH_GPG_SECRET_KEY }} @@ -43,4 +43,4 @@ jobs: command: release-pr release-type: simple package-name: ${{ github.event.repository.name }} - changelog-types: '[{"type":"feat","section":"Features","hidden":false},{"type":"fix","section":"Bug Fixes","hidden":false},{"type":"api","section":"API changes","hidden":false}]' \ No newline at end of file + changelog-types: '[{"type":"feat","section":"Features","hidden":false},{"type":"fix","section":"Bug Fixes","hidden":false},{"type":"api","section":"API changes","hidden":false}]'