diff --git a/build.cake b/build.cake index b55497d..b717a2d 100644 --- a/build.cake +++ b/build.cake @@ -4,7 +4,7 @@ var package = "DependencyCheck.Runner.Tool"; var apiKey = EnvironmentVariable("NUGET_API_KEY") ?? "abcdef0123456789"; var buildNumber = EnvironmentVariable("APPVEYOR_BUILD_NUMBER") ?? "1"; -var version = EnvironmentVariable("APPVEYOR_REPO_TAG_NAME") ?? "3.2.0"; +var version = EnvironmentVariable("APPVEYOR_REPO_TAG_NAME") ?? "3.2.1"; var toolVersion = version; Setup(context => diff --git a/runner/bin/dependency-check.bat b/runner/bin/dependency-check.bat index 80f6661..ddcf688 100644 --- a/runner/bin/dependency-check.bat +++ b/runner/bin/dependency-check.bat @@ -69,7 +69,7 @@ if "%JAVACMD%"=="" set JAVACMD=java if "%REPO%"=="" set REPO=%BASEDIR%\repo -set CLASSPATH="%BASEDIR%"\plugins\*;"%REPO%"\commons-cli\commons-cli\1.4\commons-cli-1.4.jar;"%REPO%"\org\owasp\dependency-check-core\3.2.0\dependency-check-core-3.2.0.jar;"%REPO%"\com\vdurmont\semver4j\2.2.0\semver4j-2.2.0.jar;"%REPO%"\joda-time\joda-time\1.6\joda-time-1.6.jar;"%REPO%"\org\apache\commons\commons-compress\1.16.1\commons-compress-1.16.1.jar;"%REPO%"\org\objenesis\objenesis\2.6\objenesis-2.6.jar;"%REPO%"\commons-io\commons-io\2.6\commons-io-2.6.jar;"%REPO%"\org\apache\commons\commons-lang3\3.7\commons-lang3-3.7.jar;"%REPO%"\org\apache\commons\commons-text\1.3\commons-text-1.3.jar;"%REPO%"\org\apache\lucene\lucene-core\5.5.5\lucene-core-5.5.5.jar;"%REPO%"\org\apache\lucene\lucene-analyzers-common\5.5.5\lucene-analyzers-common-5.5.5.jar;"%REPO%"\org\apache\lucene\lucene-queryparser\5.5.5\lucene-queryparser-5.5.5.jar;"%REPO%"\org\apache\lucene\lucene-queries\5.5.5\lucene-queries-5.5.5.jar;"%REPO%"\org\apache\lucene\lucene-sandbox\5.5.5\lucene-sandbox-5.5.5.jar;"%REPO%"\org\apache\velocity\velocity\1.7\velocity-1.7.jar;"%REPO%"\commons-collections\commons-collections\3.2.2\commons-collections-3.2.2.jar;"%REPO%"\commons-lang\commons-lang\2.4\commons-lang-2.4.jar;"%REPO%"\com\h2database\h2\1.4.196\h2-1.4.196.jar;"%REPO%"\org\glassfish\javax.json\1.0.4\javax.json-1.0.4.jar;"%REPO%"\org\jsoup\jsoup\1.11.3\jsoup-1.11.3.jar;"%REPO%"\com\sun\mail\mailapi\1.6.1\mailapi-1.6.1.jar;"%REPO%"\javax\activation\activation\1.1\activation-1.1.jar;"%REPO%"\com\google\code\gson\gson\2.8.4\gson-2.8.4.jar;"%REPO%"\org\owasp\dependency-check-utils\3.2.0\dependency-check-utils-3.2.0.jar;"%REPO%"\org\slf4j\slf4j-api\1.7.25\slf4j-api-1.7.25.jar;"%REPO%"\ch\qos\logback\logback-core\1.2.3\logback-core-1.2.3.jar;"%REPO%"\ch\qos\logback\logback-classic\1.2.3\logback-classic-1.2.3.jar;"%REPO%"\org\apache\ant\ant\1.9.9\ant-1.9.9.jar;"%REPO%"\org\owasp\dependency-check-cli\3.2.0\dependency-check-cli-3.2.0.jar +set CLASSPATH="%BASEDIR%"\plugins\*;"%REPO%"\commons-cli\commons-cli\1.4\commons-cli-1.4.jar;"%REPO%"\org\owasp\dependency-check-core\3.2.1\dependency-check-core-3.2.1.jar;"%REPO%"\com\vdurmont\semver4j\2.2.0\semver4j-2.2.0.jar;"%REPO%"\joda-time\joda-time\1.6\joda-time-1.6.jar;"%REPO%"\org\apache\commons\commons-compress\1.16.1\commons-compress-1.16.1.jar;"%REPO%"\org\objenesis\objenesis\2.6\objenesis-2.6.jar;"%REPO%"\commons-io\commons-io\2.6\commons-io-2.6.jar;"%REPO%"\org\apache\commons\commons-lang3\3.7\commons-lang3-3.7.jar;"%REPO%"\org\apache\commons\commons-text\1.3\commons-text-1.3.jar;"%REPO%"\org\apache\lucene\lucene-core\5.5.5\lucene-core-5.5.5.jar;"%REPO%"\org\apache\lucene\lucene-analyzers-common\5.5.5\lucene-analyzers-common-5.5.5.jar;"%REPO%"\org\apache\lucene\lucene-queryparser\5.5.5\lucene-queryparser-5.5.5.jar;"%REPO%"\org\apache\lucene\lucene-queries\5.5.5\lucene-queries-5.5.5.jar;"%REPO%"\org\apache\lucene\lucene-sandbox\5.5.5\lucene-sandbox-5.5.5.jar;"%REPO%"\org\apache\velocity\velocity\1.7\velocity-1.7.jar;"%REPO%"\commons-collections\commons-collections\3.2.2\commons-collections-3.2.2.jar;"%REPO%"\commons-lang\commons-lang\2.4\commons-lang-2.4.jar;"%REPO%"\com\h2database\h2\1.4.196\h2-1.4.196.jar;"%REPO%"\org\glassfish\javax.json\1.0.4\javax.json-1.0.4.jar;"%REPO%"\org\jsoup\jsoup\1.11.3\jsoup-1.11.3.jar;"%REPO%"\com\sun\mail\mailapi\1.6.1\mailapi-1.6.1.jar;"%REPO%"\javax\activation\activation\1.1\activation-1.1.jar;"%REPO%"\com\google\code\gson\gson\2.8.5\gson-2.8.5.jar;"%REPO%"\org\owasp\dependency-check-utils\3.2.1\dependency-check-utils-3.2.1.jar;"%REPO%"\org\slf4j\slf4j-api\1.7.25\slf4j-api-1.7.25.jar;"%REPO%"\ch\qos\logback\logback-core\1.2.3\logback-core-1.2.3.jar;"%REPO%"\ch\qos\logback\logback-classic\1.2.3\logback-classic-1.2.3.jar;"%REPO%"\org\apache\ant\ant\1.9.9\ant-1.9.9.jar;"%REPO%"\org\owasp\dependency-check-cli\3.2.1\dependency-check-cli-3.2.1.jar set ENDORSED_DIR= if NOT "%ENDORSED_DIR%" == "" set CLASSPATH="%BASEDIR%"\%ENDORSED_DIR%\*;%CLASSPATH% diff --git a/runner/bin/dependency-check.sh b/runner/bin/dependency-check.sh index 856c590..063d112 100755 --- a/runner/bin/dependency-check.sh +++ b/runner/bin/dependency-check.sh @@ -94,7 +94,7 @@ then REPO="$BASEDIR"/repo fi -CLASSPATH="$BASEDIR"/plugins/*:"$REPO"/commons-cli/commons-cli/1.4/commons-cli-1.4.jar:"$REPO"/org/owasp/dependency-check-core/3.2.0/dependency-check-core-3.2.0.jar:"$REPO"/com/vdurmont/semver4j/2.2.0/semver4j-2.2.0.jar:"$REPO"/joda-time/joda-time/1.6/joda-time-1.6.jar:"$REPO"/org/apache/commons/commons-compress/1.16.1/commons-compress-1.16.1.jar:"$REPO"/org/objenesis/objenesis/2.6/objenesis-2.6.jar:"$REPO"/commons-io/commons-io/2.6/commons-io-2.6.jar:"$REPO"/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar:"$REPO"/org/apache/commons/commons-text/1.3/commons-text-1.3.jar:"$REPO"/org/apache/lucene/lucene-core/5.5.5/lucene-core-5.5.5.jar:"$REPO"/org/apache/lucene/lucene-analyzers-common/5.5.5/lucene-analyzers-common-5.5.5.jar:"$REPO"/org/apache/lucene/lucene-queryparser/5.5.5/lucene-queryparser-5.5.5.jar:"$REPO"/org/apache/lucene/lucene-queries/5.5.5/lucene-queries-5.5.5.jar:"$REPO"/org/apache/lucene/lucene-sandbox/5.5.5/lucene-sandbox-5.5.5.jar:"$REPO"/org/apache/velocity/velocity/1.7/velocity-1.7.jar:"$REPO"/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar:"$REPO"/commons-lang/commons-lang/2.4/commons-lang-2.4.jar:"$REPO"/com/h2database/h2/1.4.196/h2-1.4.196.jar:"$REPO"/org/glassfish/javax.json/1.0.4/javax.json-1.0.4.jar:"$REPO"/org/jsoup/jsoup/1.11.3/jsoup-1.11.3.jar:"$REPO"/com/sun/mail/mailapi/1.6.1/mailapi-1.6.1.jar:"$REPO"/javax/activation/activation/1.1/activation-1.1.jar:"$REPO"/com/google/code/gson/gson/2.8.4/gson-2.8.4.jar:"$REPO"/org/owasp/dependency-check-utils/3.2.0/dependency-check-utils-3.2.0.jar:"$REPO"/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar:"$REPO"/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar:"$REPO"/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar:"$REPO"/org/apache/ant/ant/1.9.9/ant-1.9.9.jar:"$REPO"/org/owasp/dependency-check-cli/3.2.0/dependency-check-cli-3.2.0.jar +CLASSPATH="$BASEDIR"/plugins/*:"$REPO"/commons-cli/commons-cli/1.4/commons-cli-1.4.jar:"$REPO"/org/owasp/dependency-check-core/3.2.1/dependency-check-core-3.2.1.jar:"$REPO"/com/vdurmont/semver4j/2.2.0/semver4j-2.2.0.jar:"$REPO"/joda-time/joda-time/1.6/joda-time-1.6.jar:"$REPO"/org/apache/commons/commons-compress/1.16.1/commons-compress-1.16.1.jar:"$REPO"/org/objenesis/objenesis/2.6/objenesis-2.6.jar:"$REPO"/commons-io/commons-io/2.6/commons-io-2.6.jar:"$REPO"/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar:"$REPO"/org/apache/commons/commons-text/1.3/commons-text-1.3.jar:"$REPO"/org/apache/lucene/lucene-core/5.5.5/lucene-core-5.5.5.jar:"$REPO"/org/apache/lucene/lucene-analyzers-common/5.5.5/lucene-analyzers-common-5.5.5.jar:"$REPO"/org/apache/lucene/lucene-queryparser/5.5.5/lucene-queryparser-5.5.5.jar:"$REPO"/org/apache/lucene/lucene-queries/5.5.5/lucene-queries-5.5.5.jar:"$REPO"/org/apache/lucene/lucene-sandbox/5.5.5/lucene-sandbox-5.5.5.jar:"$REPO"/org/apache/velocity/velocity/1.7/velocity-1.7.jar:"$REPO"/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar:"$REPO"/commons-lang/commons-lang/2.4/commons-lang-2.4.jar:"$REPO"/com/h2database/h2/1.4.196/h2-1.4.196.jar:"$REPO"/org/glassfish/javax.json/1.0.4/javax.json-1.0.4.jar:"$REPO"/org/jsoup/jsoup/1.11.3/jsoup-1.11.3.jar:"$REPO"/com/sun/mail/mailapi/1.6.1/mailapi-1.6.1.jar:"$REPO"/javax/activation/activation/1.1/activation-1.1.jar:"$REPO"/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar:"$REPO"/org/owasp/dependency-check-utils/3.2.1/dependency-check-utils-3.2.1.jar:"$REPO"/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar:"$REPO"/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar:"$REPO"/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar:"$REPO"/org/apache/ant/ant/1.9.9/ant-1.9.9.jar:"$REPO"/org/owasp/dependency-check-cli/3.2.1/dependency-check-cli-3.2.1.jar ENDORSED_DIR= if [ -n "$ENDORSED_DIR" ] ; then diff --git a/runner/repo/com/google/code/gson/gson/2.8.4/gson-2.8.4.jar b/runner/repo/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar similarity index 81% rename from runner/repo/com/google/code/gson/gson/2.8.4/gson-2.8.4.jar rename to runner/repo/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar index 41bae96..0d5baf3 100644 Binary files a/runner/repo/com/google/code/gson/gson/2.8.4/gson-2.8.4.jar and b/runner/repo/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar differ diff --git a/runner/repo/org/owasp/dependency-check-cli/3.2.0/dependency-check-cli-3.2.0.jar b/runner/repo/org/owasp/dependency-check-cli/3.2.1/dependency-check-cli-3.2.1.jar similarity index 85% rename from runner/repo/org/owasp/dependency-check-cli/3.2.0/dependency-check-cli-3.2.0.jar rename to runner/repo/org/owasp/dependency-check-cli/3.2.1/dependency-check-cli-3.2.1.jar index 4d475e9..47bf7ad 100644 Binary files a/runner/repo/org/owasp/dependency-check-cli/3.2.0/dependency-check-cli-3.2.0.jar and b/runner/repo/org/owasp/dependency-check-cli/3.2.1/dependency-check-cli-3.2.1.jar differ diff --git a/runner/repo/org/owasp/dependency-check-core/3.2.0/dependency-check-core-3.2.0.jar b/runner/repo/org/owasp/dependency-check-core/3.2.1/dependency-check-core-3.2.1.jar similarity index 83% rename from runner/repo/org/owasp/dependency-check-core/3.2.0/dependency-check-core-3.2.0.jar rename to runner/repo/org/owasp/dependency-check-core/3.2.1/dependency-check-core-3.2.1.jar index 6343434..1679752 100644 Binary files a/runner/repo/org/owasp/dependency-check-core/3.2.0/dependency-check-core-3.2.0.jar and b/runner/repo/org/owasp/dependency-check-core/3.2.1/dependency-check-core-3.2.1.jar differ diff --git a/runner/repo/org/owasp/dependency-check-utils/3.2.0/dependency-check-utils-3.2.0.jar b/runner/repo/org/owasp/dependency-check-utils/3.2.1/dependency-check-utils-3.2.1.jar similarity index 86% rename from runner/repo/org/owasp/dependency-check-utils/3.2.0/dependency-check-utils-3.2.0.jar rename to runner/repo/org/owasp/dependency-check-utils/3.2.1/dependency-check-utils-3.2.1.jar index 00d7bdd..0e5a0f1 100644 Binary files a/runner/repo/org/owasp/dependency-check-utils/3.2.0/dependency-check-utils-3.2.0.jar and b/runner/repo/org/owasp/dependency-check-utils/3.2.1/dependency-check-utils-3.2.1.jar differ