Merge pull request #376 from checkmarx-ltd/develop

pr-CXFLW-916-scan-with-settings
checkmarx-ltd · Jan 29, 2024 · 294c9fc · 294c9fc
2 parents c759667 + fdf34c0
commit 294c9fc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,8 +10,8 @@
 	</parent>
 	<groupId>com.github.checkmarx-ltd</groupId>
 	<artifactId>cx-spring-boot-sdk</artifactId>
+	<version>0.5.71</version>
 
-	<version>0.5.70</version>
 	<name>cx-spring-boot-sdk</name>
 	<description>Checkmarx Java Spring Boot SDK</description>
 	<properties>

diff --git a/src/main/java/com/checkmarx/sdk/service/CxService.java b/src/main/java/com/checkmarx/sdk/service/CxService.java
@@ -2188,14 +2188,8 @@ public Integer createScan(CxScanParams params, String comment) throws CheckmarxE
         Integer projectId = determineProjectId(params, teamId);
         boolean projectExistedBeforeScan = !projectId.equals(UNKNOWN_INT);
         Integer baseProjectId = UNKNOWN_INT;
-        //preserving settings
-        Gitremotemain gitremotemainObj = getGitRepoDetails(projectId);
-        Customremotemain customremotemainObj = getCustomRepoDetails(projectId);
-        Perforceremotemain perforceremotemainObj = getPerforceRepoDetails(projectId);
-        Sharedremotemain sharedremotemainObj = getSharedRepoDetails(projectId);
-        Svnremotemain svnremotemainObj = getSvnRepoDetails(projectId);
-        Tfsremotemain tfsremotemainObj = getTfsRepoDetails(projectId);
-        ExcludeSettingsmain excludeSettingsmainObj = getExcludeSettingsDetails(projectId);
+
+
 
         if (!projectExistedBeforeScan) {
             /*
@@ -2378,8 +2372,14 @@ public Integer createScan(CxScanParams params, String comment) throws CheckmarxE
         }
 
 
-
-
+//preserving settings
+        Gitremotemain gitremotemainObj = getGitRepoDetails(projectId);
+        Customremotemain customremotemainObj = getCustomRepoDetails(projectId);
+        Perforceremotemain perforceremotemainObj = getPerforceRepoDetails(projectId);
+        Sharedremotemain sharedremotemainObj = getSharedRepoDetails(projectId);
+        Svnremotemain svnremotemainObj = getSvnRepoDetails(projectId);
+        Tfsremotemain tfsremotemainObj = getTfsRepoDetails(projectId);
+        ExcludeSettingsmain excludeSettingsmainObj = getExcludeSettingsDetails(projectId);
         prepareSources(params, projectId);
         //Setting Remembered Git Settings
         if (gitremotemainObj != null) {