Upgrade of gradle-jpi plugin, jenkins version and supporting libs

build.gradle

@@ -4,7 +4,25 @@ buildscript {
 }
 
 plugins {
-    id 'org.jenkins-ci.jpi' version '0.38.0'
+    // this version (0.43.0 and up) , uses a later version of test-harness eliminating the 
+    // dependency on a compromised version of apache commons-text.  Shows as a red-herring in scans
+    id 'org.jenkins-ci.jpi' version '0.46.0'
+}
+
+java {
+    registerFeature('workflowJob') {
+        usingSourceSet(sourceSets.main)
+    }
+    registerFeature('workflowJobDsl') {
+        usingSourceSet(sourceSets.main)
+    }
+    registerFeature('workflowCps') {
+        usingSourceSet(sourceSets.main)
+    }
+    registerFeature('workflowStepApi') {
+        usingSourceSet(sourceSets.main)
+    }
+
 }
 
 project.ext.excludesFromTestCoverage = ['**/DetectDownloadStrategy.java', '**/DetectPipelineStep.java', '**/DetectPostBuildStep.java', '**/DetectAirGapInstallation.java']
@@ -26,7 +44,9 @@ artifactory {
 }
 
 jenkinsPlugin {
-    coreVersion = '2.248'
+    //coreVersion = '2.377' // as of version 0.40.0 of jpi, it's jenkinsVersion...
+    //jenkinsVersion = '2.377' // as of version 0.40.0 of jpi, it's jenkinsVersion...
+    jenkinsVersion = '2.359'
     displayName = 'Synopsys Detect plugin'
     compatibleSinceVersion = '8.0.0'
     url = 'https://wiki.jenkins.io/display/JENKINS/Synopsys+Detect+Plugin'
@@ -36,22 +56,22 @@ jenkinsPlugin {
 }
 
 dependencies {
-    annotationProcessor 'com.synopsys.integration:jenkins-annotation-processor:0.0.5'
+    annotationProcessor 'com.synopsys.integration:jenkins-annotation-processor:0.0.6'
 
-    implementation 'com.synopsys.integration:blackduck-common:66.0.2'
-    implementation 'com.synopsys.integration:jenkins-common:0.5.3'
+    implementation 'com.synopsys.integration:blackduck-common:66.1.2'
+    implementation 'com.synopsys.integration:jenkins-common:0.5.4'
     implementation 'org.jvnet.localizer:localizer:1.31'
 
-    jenkinsPlugins 'org.jenkins-ci.plugins:credentials:2.3.12'
-    jenkinsPlugins 'org.jenkins-ci.plugins:plain-credentials:1.7'
+    implementation 'org.jenkins-ci.plugins:credentials:1139.veb_9579fca_33b_'
+    implementation 'org.jenkins-ci.plugins:plain-credentials:1.8'
 
-    optionalJenkinsPlugins 'org.jenkins-ci.plugins:job-dsl:1.77'
-    optionalJenkinsPlugins 'org.jenkins-ci.plugins.workflow:workflow-job:2.39'
-    optionalJenkinsPlugins 'org.jenkins-ci.plugins.workflow:workflow-cps:2.81'
-    optionalJenkinsPlugins 'org.jenkins-ci.plugins.workflow:workflow-step-api:2.22'
+    workflowJobDslApi 'org.jenkins-ci.plugins:job-dsl:1.80'
+    workflowJobApi 'org.jenkins-ci.plugins.workflow:workflow-job:1203.v7b_7023424efe'
+    workflowCpsApi 'org.jenkins-ci.plugins.workflow:workflow-cps:2729.2732.vda_e3f07b_5a_f8'
+    workflowStepApiApi 'org.jenkins-ci.plugins.workflow:workflow-step-api:622.vb_8e7c15b_c95a_'
 
-    testCompile group: 'org.jenkins-ci.main', name: 'jenkins-test-harness', version: '2.65'
-    testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.6.2'
-    testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.6.2'
-    testCompile group: 'org.mockito', name: 'mockito-core', version: '2.23.4'
+    testImplementation group: 'org.jenkins-ci.main', name: 'jenkins-test-harness', version: '1812.v6d4e97d91fd8'
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.6.2'
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.6.2'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.23.4'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip

src/main/java/com/synopsys/integration/jenkins/detect/service/DetectArgumentService.java

@@ -103,7 +103,8 @@ private String escapeArgument(String argument, Function<String, String> escaper)
         String cleanedArg = argument;
         if (argument.startsWith("--") && argument.contains("=")) {
             String[] splitArgument = argument.split("=", 2);
-            cleanedArg = splitArgument[0] + "=" + escaper.apply(splitArgument[1]);
+            String endArg = splitArgument[1].endsWith("==") ? splitArgument[1] : escaper.apply(splitArgument[1]);
+            cleanedArg = splitArgument[0] + "=" + endArg;
         }
 
         return cleanedArg;