Merge branch 'main' into Other/AST-104240

Author: cx-sumit-morchhale

.github/workflows/release.yml

@@ -100,7 +100,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 }}
@@ -153,4 +153,4 @@ jobs:
       cli_version: ${{ needs.release.outputs.CLI_VERSION }}
       is_cli_release: false
       is_java_release: true
-    secrets: inherit
+    secrets: inherit

CODEOWNERS

@@ -2,4 +2,4 @@
 # Each line is a file pattern followed by one or more owners
 
 # Specify the default owners for the entire repository
-*       @greensd4 @AlvoBen @pedrompflopes
+*       @cx-anurag-dalke @cx-anand-nandeshwar @cx-atish-jadhav

checkmarx-ast-cli.version

@@ -1 +1 @@
-2.3.27
+2.3.28

pom.xml

@@ -165,17 +165,17 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.13</version>
+                <groupId>org.sonatype.central</groupId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
+                <version>0.8.0</version>
                 <extensions>true</extensions>
                 <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                    <stagingProgressTimeoutMinutes>10</stagingProgressTimeoutMinutes>
+                    <publishingServerId>central</publishingServerId>
+                    <autoPublish>true</autoPublish> <!-- Optional -->
                 </configuration>
             </plugin>
+
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
@@ -199,17 +199,15 @@
         </plugins>
     </build>
 
+
     <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
         <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+            <id>central</id>
+            <url>https://central.sonatype.com/api/v1/publish</url>
         </repository>
     </distributionManagement>
 
+
     <licenses>
         <license>
             <name>MIT License</name>
@@ -230,8 +228,8 @@
 
     <developers>
         <developer>
-            <name>Jay Nanduri</name>
-            <email>jay.nanduri@checkmarx.com</email>
+            <name>Rahul Pidde</name>
+            <email>rahul.pidde@checkmarx.com</email>
             <organization>Checkmarx</organization>
             <organizationUrl>https://www.checkmarx.com/</organizationUrl>
         </developer>

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<String> toArguments() {
         List<String> 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())) {

src/main/resources/cx-linux

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21771d942fb89bbd90c919037cda83447a1203cd326830434337c32a3492dc0f
-size 75620536
+oid sha256:1d2436e1fef7dd4841a003697702e52e2cdc3f3fba74e2196cebe5d7992f9d4f
+size 76206264

src/main/resources/cx-linux-arm

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9226496082c2c9ec4f4b0849bdabd519c19199c7b351fce85c30ebd92433664b
-size 72155320
+oid sha256:e41b066ccc5dd4281a134518b3ece5ac6c17f229c9a7844493371ac3936a94a4
+size 72745144

src/main/resources/cx-mac

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ce7a37c2b110f904854ec9fad0af04fd23396ed752547892b414171dd85f2c7
-size 152195760
+oid sha256:4764f25769b820906cf09c6b3281f2b1df7c021f9063aef983f2aac0c48e39bc
+size 153324992

src/main/resources/cx.exe

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4bbeacde274d8f70bc971071523ef2885bcaba7592a8f9108fe94af719028eac
-size 77585792
+oid sha256:7968c2c1ec4e6264e91324f649f2bb44db04e53ce20f90f3a77c56abf2525664
+size 78184384