From 8add811c797813d5cc6342486b7627776ac42856 Mon Sep 17 00:00:00 2001 From: cx-anand-nandeshwar <73646287+cx-anand-nandeshwar@users.noreply.github.com> Date: Thu, 17 Jul 2025 14:44:04 +0530 Subject: [PATCH 1/5] Added dynamic client-id support for refresh token grant flow. --- src/main/java/com/checkmarx/ast/wrapper/CxConfig.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java b/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java index 8d76e4f9..f23a5ea8 100644 --- a/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java +++ b/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.Setter; import org.apache.commons.lang3.StringUtils; + import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; @@ -33,7 +34,15 @@ public void setAdditionalParameters(String additionalParameters) { List toArguments() { List commands = new ArrayList<>(); - if (StringUtils.isNotBlank(getApiKey())) { + if (StringUtils.isNotBlank(getClientId()) && StringUtils.isNotBlank(getApiKey())) { + /* + * Added dynamic client-id support for refresh_token grant flow + */ + commands.add(CxConstants.CLIENT_ID); + commands.add(getClientId()); + commands.add(CxConstants.API_KEY); + commands.add(getApiKey()); + } else if (StringUtils.isNotBlank(getApiKey())) { commands.add(CxConstants.API_KEY); commands.add(getApiKey()); } else if (StringUtils.isNotBlank(getClientId()) && StringUtils.isNotBlank(getClientSecret())) { From 78997d909f617e8b596bff9fa5a3716466baaf6e Mon Sep 17 00:00:00 2001 From: Rahul Pidde <206018639+cx-rah-pid@users.noreply.github.com> Date: Mon, 21 Jul 2025 12:44:40 +0530 Subject: [PATCH 2/5] using maven central to publish artifact --- .github/workflows/release.yml | 2 +- pom.xml | 20 ++------------------ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8201c4a3..be79cbba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -77,7 +77,7 @@ jobs: with: java-version: '11' distribution: 'temurin' - server-id: ossrh + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} diff --git a/pom.xml b/pom.xml index 787efc66..049ac20b 100644 --- a/pom.xml +++ b/pom.xml @@ -164,18 +164,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - true - - ossrh - https://oss.sonatype.org/ - true - 10 - - org.apache.maven.plugins maven-gpg-plugin @@ -200,13 +188,9 @@ - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + central + https://central.sonatype.com/api/v1/publish From 5536d5ecae53f50ba4f8cc95ccef702ecb3c845c Mon Sep 17 00:00:00 2001 From: Rahul Pidde <206018639+cx-rah-pid@users.noreply.github.com> Date: Mon, 21 Jul 2025 13:19:25 +0530 Subject: [PATCH 3/5] updated name and email id --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 049ac20b..fdef058c 100644 --- a/pom.xml +++ b/pom.xml @@ -214,8 +214,8 @@ - Jay Nanduri - jay.nanduri@checkmarx.com + Rahul Pidde + rahul.pidde@checkmarx.com Checkmarx https://www.checkmarx.com/ From e50c916406d3bdff8de3e79dd215c58b0ba968be Mon Sep 17 00:00:00 2001 From: Rahul Pidde <206018639+cx-rah-pid@users.noreply.github.com> Date: Mon, 21 Jul 2025 13:28:33 +0530 Subject: [PATCH 4/5] updating pom.xml --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index fdef058c..796b6dbc 100644 --- a/pom.xml +++ b/pom.xml @@ -164,6 +164,18 @@ + + org.sonatype.central + central-publishing-maven-plugin + 0.8.0 + true + + central + true + + + + org.apache.maven.plugins maven-gpg-plugin From 079734735f232c5191eee01b6e384bb5883a8147 Mon Sep 17 00:00:00 2001 From: cx-anand-nandeshwar <73646287+cx-anand-nandeshwar@users.noreply.github.com> Date: Mon, 28 Jul 2025 15:56:39 +0530 Subject: [PATCH 5/5] Reverting library version to old. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1fa3c606..f848047c 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.commons commons-lang3 - 3.18.0 + 3.14.0 com.googlecode.json-simple @@ -44,7 +44,7 @@ com.google.code.gson gson - 2.12.0 + 2.10.1 org.slf4j