From d129e85b51ff120dfd1a878caeb76a095a42fff1 Mon Sep 17 00:00:00 2001
From: swatipersistent <99341045+swatipersistent@users.noreply.github.com>
Date: Tue, 27 Sep 2022 03:03:04 -0700
Subject: [PATCH 1/3] Update CxScanBuilder.java

bug 1: 'is force scan' parameter gets printed twice in logs .
bug 2: \n gets added to custom fields error message
---
 src/main/java/com/checkmarx/jenkins/CxScanBuilder.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java b/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java
index 17ed3212..2d51b77a 100644
--- a/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java
+++ b/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java
@@ -1722,7 +1722,7 @@ private void printConfiguration(CxScanConfig config, CxLoggerAdapter log) {
         log.info("enable Project Policy Enforcement: " + config.getEnablePolicyViolations());
         log.info("continue build when timed out: " + config.getContinueBuild());
         log.info("post scan action: " + config.getPostScanActionId());
-        log.info("is force scan: " + config.getForceScan());
+        //log.info("is force scan: " + config.getForceScan());
         log.info("scan level custom fields: " + config.getCustomFields());
 
         ScannerType scannerType = getDependencyScannerType(config);
@@ -2552,7 +2552,7 @@ public FormValidation doCheckCustomFields(@QueryParameter String value,@Ancestor
             Pattern pattern = Pattern.compile("(^([a-zA-Z0-9#._]*):([a-zA-Z0-9#._]*)+(,([a-zA-Z0-9#._]*):([a-zA-Z0-9#._]*)+)*$)");
             Matcher match = pattern.matcher(value);
             if (!StringUtil.isNullOrEmpty(value) && !match.find()) {
-            	return FormValidation.error("Custom Fields must have given format: key1:val1,key2:val2. \nCustom field allows to use these special characters: # . _ ");
+            	return FormValidation.error("Custom Fields must have given format: key1:val1,key2:val2. Custom field allows to use these special characters: # . _ ");
             }
 
             return FormValidation.ok();

From d056a3db82f8bdc2fbf38117cc91da2485086505 Mon Sep 17 00:00:00 2001
From: swatipersistent <99341045+swatipersistent@users.noreply.github.com>
Date: Wed, 28 Sep 2022 02:15:08 -0700
Subject: [PATCH 2/3] Update jobMain.jelly

Removed Displayed results are of the previous successful scan.
---
 .../com/checkmarx/jenkins/CxProjectResult/jobMain.jelly         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/com/checkmarx/jenkins/CxProjectResult/jobMain.jelly b/src/main/resources/com/checkmarx/jenkins/CxProjectResult/jobMain.jelly
index 7dfbdb90..2db7f0f3 100644
--- a/src/main/resources/com/checkmarx/jenkins/CxProjectResult/jobMain.jelly
+++ b/src/main/resources/com/checkmarx/jenkins/CxProjectResult/jobMain.jelly
@@ -32,7 +32,7 @@
                <j:if test="${result.isRemoveAsyncHtml()}">
              	<div id="async-note">
                     <div class="async-note"><div class="async-note-title">Note:</div>
-                        <div class="async-note-body" id="async-note-body">Job is configured to run Checkmarx scan asynchronously. Displayed results are of the previous successful scan.</div></div>
+                        <div class="async-note-body" id="async-note-body">Job is configured to run Checkmarx scan asynchronously.</div></div>
                 </div>
                 <div>
                     ${result.getHtmlReport()}

From 4402da6ebbcd2859776c8baa29b6743f906c8dc3 Mon Sep 17 00:00:00 2001
From: swatipersistent <99341045+swatipersistent@users.noreply.github.com>
Date: Wed, 28 Sep 2022 03:42:11 -0700
Subject: [PATCH 3/3] Update jobMain.jelly

<div>
                    ${result.getHtmlReport()}
                </div>
---
 .../com/checkmarx/jenkins/CxProjectResult/jobMain.jelly       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/resources/com/checkmarx/jenkins/CxProjectResult/jobMain.jelly b/src/main/resources/com/checkmarx/jenkins/CxProjectResult/jobMain.jelly
index 2db7f0f3..894dd75a 100644
--- a/src/main/resources/com/checkmarx/jenkins/CxProjectResult/jobMain.jelly
+++ b/src/main/resources/com/checkmarx/jenkins/CxProjectResult/jobMain.jelly
@@ -34,9 +34,7 @@
                     <div class="async-note"><div class="async-note-title">Note:</div>
                         <div class="async-note-body" id="async-note-body">Job is configured to run Checkmarx scan asynchronously.</div></div>
                 </div>
-                <div>
-                    ${result.getHtmlReport()}
-                </div>
+                
             </j:if> 
             
             <j:if test="${!result.isRemoveAsyncHtml()}">