Merge pull request #452 from checkmarx-ltd/pr-CXFLW-1680-source-control-fix

Added version for scanWithSetting API

Author: cx-kedar-bhujade

src/main/java/com/checkmarx/sdk/service/CxService.java

@@ -1883,8 +1883,8 @@ public void uploadProjectSource(Integer projectId, File file) throws CheckmarxEx
     public Integer uploadProjectSource(CxScanParams params,Integer projectId, File file,String comment) throws CheckmarxException {
         HttpHeaders headers = authClient.createAuthHeaders();
         headers.setContentType(MediaType.MULTIPART_FORM_DATA);
-
         LinkedMultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
+        headers.add("version", "1.2");
         FileSystemResource value = new FileSystemResource(file);
         map.add("projectId", projectId);
         map.add("customFields", params.getCustomFields());
@@ -1896,9 +1896,7 @@ public Integer uploadProjectSource(CxScanParams params,Integer projectId, File f
         map.add("presetId", getPresetId(params.getScanPreset()));
         map.add("engineConfigurationId",getScanConfiguration(params.getScanConfiguration()));
         map.add("zippedSource", value);
-
         HttpEntity<LinkedMultiValueMap<String, Object>> requestEntity = new HttpEntity<>(map, headers);
-
         try {
             log.info("Updating Source details for project Id {}", projectId);
             String response = restTemplate.exchange(cxProperties.getUrl().concat(PROJECT_SOURCE_FILE_WITH_SETTINGS), HttpMethod.POST, requestEntity, String.class).getBody();
@@ -2720,7 +2718,6 @@ private SASTScanReport prepareSources(CxScanParams params, Integer projectId, St
                 return new SASTScanReport(UNKNOWN_INT,true);
             }else if(cxProperties.getEnabledZipScan() && !cxProperties.getOverrideProjectSetting()){
                 String clonedRepoPath = cxRepoFileHelper.prepareRepoFile(params);
-                uploadProjectSource(params,projectId, new File(clonedRepoPath),comment);
                 params.setFilePath(clonedRepoPath);
                 return new SASTScanReport(uploadProjectSource(params,projectId, new File(clonedRepoPath),comment),false);
             }