Merge pull request #417 from checkmarx-ltd/develop

code merge for first scan og branched scan to be incremental

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.github.checkmarx-ltd</groupId>
 	<artifactId>cx-spring-boot-sdk</artifactId>
-	<version>0.6.13</version>
+	<version>0.6.14</version>
 
 
 	<name>cx-spring-boot-sdk</name>

src/main/java/com/checkmarx/sdk/config/CxProperties.java

@@ -2,6 +2,7 @@
 
 import com.checkmarx.sdk.utils.ScanUtils;
 import com.google.common.collect.ImmutableMap;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -33,6 +34,11 @@ public class CxProperties extends CxPropertiesBase{
 
     private Boolean preserveXml = false;
 
+    @Getter
+    @Setter
+    @Builder.Default
+    private Boolean isBranchedIncremental = false;
+
     @Getter
     @Setter
     private int corepoolsize;

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

@@ -2427,6 +2427,9 @@ public Integer createScan(CxScanParams params, String comment) throws CheckmarxE
             else{
                 log.info("Scan will be incremental");
             }
+        }else if(params.isIncremental() && !projectExistedBeforeScan && cxProperties.getIsBranchedIncremental()) {
+            log.info("Scan will be incremental");
+            params.setIncremental(true);
         }
         else {
             log.info("Scan will be Full Scan");