Minor enhancements to some tool scripts.

Author: davewichers

scripts/runFindBugs.bat

@@ -1,6 +1,7 @@
 # source "scripts/verifyBenchmarkPluginAvailable.sh" - Don't have .bat version of this (yet)
+
 # FindBugs is dead, so this specifies the specific (last) version of findbugs. Its version is not defined in the pom.xml file.
 # The buildtime elements when invoking the findbugs-maven-plugin leverage the buildtime extension specified in: .mvn/extensions.xml
-CALL mvn compile org.codehaus.mojo:findbugs-maven-plugin:3.0.5:findbugs -Dbuildtime.output.csv=true -Dbuildtime.output.csv.file=../data/out.csv
-CALL mvn org.owasp:benchmarkutils-maven-plugin:append-time -DtoolName=findbugs
+call mvn compile org.codehaus.mojo:findbugs-maven-plugin:3.0.5:findbugs -Dbuildtime.output.csv=true -Dbuildtime.output.csv.file=../data/out.csv
+call mvn org.owasp:benchmarkutils-maven-plugin:append-time -DtoolName=findbugs
 

scripts/runFindSecBugs.bat

@@ -1,5 +1,7 @@
 # source "scripts/verifyBenchmarkPluginAvailable.sh" - Don't have .bat version of this (yet)
-# The buildtime elements when invoking the findbugs-maven-plugin leverage the buildtime extension specified in: .mvn/extensions.xml
-CALL mvn compile -Pfindsecbugs -Dbuildtime.output.csv=true -Dbuildtime.output.csv.file=../data/out.csv
-CALL mvn org.owasp:benchmarkutils-maven-plugin:append-time -DtoolName=findsecbugs
+
+# The buildtime elements when invoking the findbugs-maven-plugin thru the findsecbugs profile leverage the
+# buildtime extension specified in: .mvn/extensions.xml
+call mvn compile -Pfindsecbugs -Dbuildtime.output.csv=true -Dbuildtime.output.csv.file=../data/out.csv
+call mvn org.owasp:benchmarkutils-maven-plugin:append-time -DtoolName=findsecbugs
 

scripts/runFindSecBugs.sh

@@ -1,5 +1,6 @@
 source "scripts/verifyBenchmarkPluginAvailable.sh"
-# The buildtime elements when invoking the findbugs-maven-plugin leverage the buildtime extension specified in: .mvn/extensions.xml
+# The buildtime elements when invoking the findbugs-maven-plugin thru the findsecbugs profile leverage the
+# buildtime extension specified in: .mvn/extensions.xml
 mvn compile -Pfindsecbugs -Dbuildtime.output.csv=true -Dbuildtime.output.csv.file=../data/out.csv
 mvn org.owasp:benchmarkutils-maven-plugin:append-time -DtoolName=findsecbugs
 

scripts/runPMD.bat

@@ -1,5 +1,5 @@
 # source "scripts/verifyBenchmarkPluginAvailable.sh" - Don't have .bat version of this (yet)
-# The buildtime elements when invoking the findbugs-maven-plugin leverage the buildtime extension specified in: .mvn/extensions.xml
-CALL mvn compile pmd:pmd -Dbuildtime.output.csv=true -Dbuildtime.output.csv.file=../data/out.csv
-CALL mvn org.owasp:benchmarkutils-maven-plugin:append-time -DtoolName=pmd
+# The buildtime elements when invoking the PMD plugin leverage the buildtime extension specified in: .mvn/extensions.xml
+call mvn compile pmd:pmd -Dbuildtime.output.csv=true -Dbuildtime.output.csv.file=../data/out.csv
+call mvn org.owasp:benchmarkutils-maven-plugin:append-time -DtoolName=pmd
 

scripts/runPMD.sh

@@ -1,5 +1,5 @@
 source "scripts/verifyBenchmarkPluginAvailable.sh"
-# The buildtime elements when invoking the findbugs-maven-plugin leverage the buildtime extension specified in: .mvn/extensions.xml
+# The buildtime elements when invoking the PMD plugin leverage the buildtime extension specified in: .mvn/extensions.xml
 mvn compile pmd:pmd -Dbuildtime.output.csv=true -Dbuildtime.output.csv.file=../data/out.csv
 mvn org.owasp:benchmarkutils-maven-plugin:append-time -DtoolName=pmd
 

scripts/runSnykSAST.sh

@@ -1,6 +1,8 @@
 # Install Snyk per: https://docs.snyk.io/snyk-cli/install-or-update-the-snyk-cli
+# Before running this, you must first run: snyk auth (and then authenticate) so snyk code is authorized to run.
+
 benchmark_version=$(scripts/getBenchmarkVersion.sh)
 Snyk_version=$(snyk -v)
 
-snyk code --sarif-file-output=results/Benchmark_$benchmark_version-snykCodeCli-v$Snyk_version.sarif
+snyk code test --sarif-file-output=results/Benchmark_$benchmark_version-snykCodeCli-v$Snyk_version-$SECONDS.sarif
 

scripts/runSnykSAST_OnWindows.sh

@@ -1,6 +1,8 @@
 # Install Snyk per: https://docs.snyk.io/snyk-cli/install-or-update-the-snyk-cli
+# Before running this, you must first run: snyk auth (and then authenticate) so snyk code is authorized to run.
+
 benchmark_version=$(scripts/getBenchmarkVersion.sh)
 Snyk_version=$(snyk-win -v)
 
-snyk-win code test --sarif-file-output=results/Benchmark_$benchmark_version-snykCodeCli-v$Snyk_version.sarif
+snyk-win code test --sarif-file-output=results/Benchmark_$benchmark_version-snykCodeCli-v$Snyk_version-$SECONDS.sarif
 

scripts/runSpotBugs.bat

@@ -1,5 +1,5 @@
 # source "scripts/verifyBenchmarkPluginAvailable.sh" - Don't have .bat version of this (yet)
-# The buildtime elements when invoking the findbugs-maven-plugin leverage the buildtime extension specified in: .mvn/extensions.xml
-CALL mvn compile spotbugs:spotbugs -Dbuildtime.output.csv=true -Dbuildtime.output.csv.file=../data/out.csv
-CALL mvn org.owasp:benchmarkutils-maven-plugin:append-time -DtoolName=spotbugs
+# The buildtime elements when invoking the Spotbugs plugin leverage the buildtime extension specified in: .mvn/extensions.xml
+call mvn compile spotbugs:spotbugs -Dbuildtime.output.csv=true -Dbuildtime.output.csv.file=../data/out.csv
+call mvn org.owasp:benchmarkutils-maven-plugin:append-time -DtoolName=spotbugs
 

scripts/runSpotBugs.sh

@@ -1,5 +1,5 @@
 source "scripts/verifyBenchmarkPluginAvailable.sh"
-# The buildtime elements when invoking the findbugs-maven-plugin leverage the buildtime extension specified in: .mvn/extensions.xml
+# The buildtime elements when invoking the Spotbugs plugin leverage the buildtime extension specified in: .mvn/extensions.xml
 mvn compile spotbugs:spotbugs -Dbuildtime.output.csv=true -Dbuildtime.output.csv.file=../data/out.csv
 mvn org.owasp:benchmarkutils-maven-plugin:append-time -DtoolName=spotbugs