From 6c08ad876aaf3f6ca0a428e645ae56318afafb2d Mon Sep 17 00:00:00 2001 From: Patrick Quirk Date: Wed, 25 Jul 2018 16:53:26 -0400 Subject: [PATCH] Remove dependency on strings.js 3.3.3 due to vulnerability report (#7834) * Removing string.js since it isn't used and has a security vulnerability * Removing string.js in favor of native methods * Updated package-lock files for those that dropped string.js * Bumped versions of affected packages --- Tasks/ANTV1/package-lock.json | 218 +++++---- Tasks/ANTV1/task.json | 2 +- Tasks/ANTV1/task.loc.json | 2 +- .../codeanalysis-common/package-lock.json | 277 ++++++----- Tasks/Common/codeanalysis-common/package.json | 1 - .../cobertura/cobertura.ant.ccenabler.ts | 11 +- .../cobertura/cobertura.gradle.ccenabler.ts | 5 +- .../cobertura/cobertura.maven.ccenabler.ts | 7 +- .../codecoverageconstants.ts | 35 +- .../jacoco/jacoco.ant.ccenabler.ts | 17 +- .../jacoco/jacoco.gradle.ccenabler.ts | 7 +- .../jacoco/jacoco.maven.ccenabler.ts | 11 +- .../codecoverage-tools/package-lock.json | 169 ++++--- Tasks/Common/codecoverage-tools/package.json | 1 - Tasks/Common/codecoverage-tools/utilities.ts | 5 +- Tasks/GradleV2/package-lock.json | 365 +++++++-------- Tasks/GradleV2/task.json | 4 +- Tasks/GradleV2/task.loc.json | 4 +- Tasks/MavenV2/package-lock.json | 438 +++++++++--------- Tasks/MavenV2/task.json | 4 +- Tasks/MavenV2/task.loc.json | 4 +- .../package-lock.json | 214 +++++---- Tasks/PublishCodeCoverageResultsV1/task.json | 2 +- .../task.loc.json | 2 +- 24 files changed, 877 insertions(+), 928 deletions(-) diff --git a/Tasks/ANTV1/package-lock.json b/Tasks/ANTV1/package-lock.json index e445bb4a9e45..1627e05aa7c3 100644 --- a/Tasks/ANTV1/package-lock.json +++ b/Tasks/ANTV1/package-lock.json @@ -18,7 +18,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -27,34 +27,33 @@ "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=", "requires": { - "css-select": "1.2.0", - "dom-serializer": "0.1.0", - "entities": "1.1.1", - "htmlparser2": "3.9.2", - "lodash.assignin": "4.2.0", - "lodash.bind": "4.2.1", - "lodash.defaults": "4.2.0", - "lodash.filter": "4.6.0", - "lodash.flatten": "4.4.0", - "lodash.foreach": "4.5.0", - "lodash.map": "4.6.0", - "lodash.merge": "4.6.1", - "lodash.pick": "4.4.0", - "lodash.reduce": "4.6.0", - "lodash.reject": "4.6.0", - "lodash.some": "4.6.0" + "css-select": "~1.2.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "^3.9.1", + "lodash.assignin": "^4.0.9", + "lodash.bind": "^4.1.4", + "lodash.defaults": "^4.0.1", + "lodash.filter": "^4.4.0", + "lodash.flatten": "^4.2.0", + "lodash.foreach": "^4.3.0", + "lodash.map": "^4.4.0", + "lodash.merge": "^4.4.0", + "lodash.pick": "^4.2.1", + "lodash.reduce": "^4.4.0", + "lodash.reject": "^4.4.0", + "lodash.some": "^4.4.0" } }, "codecoverage-tools": { "version": "file:../../_build/Tasks/Common/codecoverage-tools-1.0.0.tgz", "requires": { - "cheerio": "0.22.0", - "fs-extra": "0.30.0", - "os": "0.1.1", - "string": "3.3.3", - "strip-bom": "3.0.0", - "vsts-task-lib": "0.9.20", - "xml2js": "0.4.19" + "cheerio": "^0.22.0", + "fs-extra": "^0.30.0", + "os": "^0.1.1", + "strip-bom": "^3.0.0", + "vsts-task-lib": "^0.9.7", + "xml2js": "^0.4.17" }, "dependencies": { "vsts-task-lib": { @@ -62,14 +61,14 @@ "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-0.9.20.tgz", "integrity": "sha1-MbFJAXkbOyFytAiZDF4bzop57Zs=", "requires": { - "glob": "6.0.4", - "minimatch": "3.0.4", - "mockery": "1.7.0", - "node-uuid": "1.4.8", - "q": "1.5.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "vso-node-api": "0.6.1" + "glob": "^6.0.1", + "minimatch": "^3.0.0", + "mockery": "^1.7.0", + "node-uuid": "^1.4.7", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "vso-node-api": "^0.6.1" } } } @@ -89,10 +88,10 @@ "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "requires": { - "boolbase": "1.0.0", - "css-what": "2.1.0", + "boolbase": "~1.0.0", + "css-what": "2.1", "domutils": "1.5.1", - "nth-check": "1.0.1" + "nth-check": "~1.0.1" } }, "css-what": { @@ -105,8 +104,8 @@ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.1" + "domelementtype": "~1.1.1", + "entities": "~1.1.1" }, "dependencies": { "domelementtype": { @@ -122,11 +121,11 @@ "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=" }, "domhandler": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz", - "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", + "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", "requires": { - "domelementtype": "1.3.0" + "domelementtype": "1" } }, "domutils": { @@ -134,8 +133,8 @@ "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.3.0" + "dom-serializer": "0", + "domelementtype": "1" } }, "entities": { @@ -148,11 +147,11 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "2.4.0", - "klaw": "1.3.1", - "path-is-absolute": "1.0.1", - "rimraf": "2.6.2" + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0", + "path-is-absolute": "^1.0.0", + "rimraf": "^2.2.8" } }, "fs.realpath": { @@ -165,11 +164,11 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "graceful-fs": { @@ -182,12 +181,12 @@ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", "requires": { - "domelementtype": "1.3.0", - "domhandler": "2.4.1", - "domutils": "1.5.1", - "entities": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "2.3.3" + "domelementtype": "^1.3.0", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^2.0.2" } }, "inflight": { @@ -195,8 +194,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -212,7 +211,7 @@ "java-common": { "version": "file:../../_build/Tasks/Common/java-common-1.0.0.tgz", "requires": { - "semver": "5.5.0", + "semver": "^5.1.0", "vsts-task-lib": "1.1.0" } }, @@ -221,7 +220,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.6" } }, "klaw": { @@ -229,7 +228,7 @@ "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.9" } }, "lodash.assignin": { @@ -297,7 +296,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" } }, "mockery": { @@ -315,7 +314,7 @@ "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", "requires": { - "boolbase": "1.0.0" + "boolbase": "~1.0.0" } }, "once": { @@ -323,7 +322,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os": { @@ -337,9 +336,9 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" }, "q": { "version": "1.5.1", @@ -347,46 +346,46 @@ "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" }, "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" }, "dependencies": { "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } }, "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=" + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "sax": { "version": "1.2.4", @@ -403,17 +402,12 @@ "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz", "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=" }, - "string": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/string/-/string-3.3.3.tgz", - "integrity": "sha1-XqIRzZLSKOGEKUmQpsyXs2anfLA=" - }, "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "strip-bom": { @@ -431,7 +425,7 @@ "resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-0.6.1.tgz", "integrity": "sha1-nT3Qao2uL/NoKvjyioRXOaC9ZIE=", "requires": { - "q": "1.5.1" + "q": "^1.0.1" } }, "vsts-task-lib": { @@ -439,14 +433,14 @@ "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-1.1.0.tgz", "integrity": "sha1-hasTGOVmwFWnY9nyUSAXx75CVts=", "requires": { - "glob": "6.0.4", - "minimatch": "3.0.4", - "mockery": "1.7.0", - "node-uuid": "1.4.8", - "q": "1.5.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "vso-node-api": "0.6.1" + "glob": "^6.0.1", + "minimatch": "^3.0.0", + "mockery": "^1.7.0", + "node-uuid": "^1.4.7", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "vso-node-api": "^0.6.1" } }, "wrappy": { @@ -459,8 +453,8 @@ "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", "integrity": "sha1-aGwg8hMgnpSr8NG88e+qKRx4J6c=", "requires": { - "sax": "1.2.4", - "xmlbuilder": "9.0.6" + "sax": ">=0.6.0", + "xmlbuilder": "~9.0.1" } }, "xmlbuilder": { diff --git a/Tasks/ANTV1/task.json b/Tasks/ANTV1/task.json index da7032bfbbde..8e6f5b36dd6e 100644 --- a/Tasks/ANTV1/task.json +++ b/Tasks/ANTV1/task.json @@ -16,7 +16,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 137, + "Minor": 139, "Patch": 0 }, "demands": [ diff --git a/Tasks/ANTV1/task.loc.json b/Tasks/ANTV1/task.loc.json index f2c33ecdd64e..00f5343b01e1 100644 --- a/Tasks/ANTV1/task.loc.json +++ b/Tasks/ANTV1/task.loc.json @@ -16,7 +16,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 137, + "Minor": 139, "Patch": 0 }, "demands": [ diff --git a/Tasks/Common/codeanalysis-common/package-lock.json b/Tasks/Common/codeanalysis-common/package-lock.json index 7bc368004849..3fbf511f6402 100644 --- a/Tasks/Common/codeanalysis-common/package-lock.json +++ b/Tasks/Common/codeanalysis-common/package-lock.json @@ -9,10 +9,10 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.0.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, "asn1": { @@ -51,7 +51,7 @@ "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", "optional": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "boolbase": { @@ -64,7 +64,7 @@ "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", "requires": { - "hoek": "4.2.0" + "hoek": "4.x.x" } }, "brace-expansion": { @@ -72,7 +72,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -86,22 +86,22 @@ "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=", "requires": { - "css-select": "1.2.0", - "dom-serializer": "0.1.0", - "entities": "1.1.1", - "htmlparser2": "3.9.2", - "lodash.assignin": "4.2.0", - "lodash.bind": "4.2.1", - "lodash.defaults": "4.2.0", - "lodash.filter": "4.6.0", - "lodash.flatten": "4.4.0", - "lodash.foreach": "4.5.0", - "lodash.map": "4.6.0", - "lodash.merge": "4.6.1", - "lodash.pick": "4.4.0", - "lodash.reduce": "4.6.0", - "lodash.reject": "4.6.0", - "lodash.some": "4.6.0" + "css-select": "~1.2.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "^3.9.1", + "lodash.assignin": "^4.0.9", + "lodash.bind": "^4.1.4", + "lodash.defaults": "^4.0.1", + "lodash.filter": "^4.4.0", + "lodash.flatten": "^4.2.0", + "lodash.foreach": "^4.3.0", + "lodash.map": "^4.4.0", + "lodash.merge": "^4.4.0", + "lodash.pick": "^4.2.1", + "lodash.reduce": "^4.4.0", + "lodash.reject": "^4.4.0", + "lodash.some": "^4.4.0" } }, "co": { @@ -114,7 +114,7 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "concat-map": { @@ -132,7 +132,7 @@ "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", "requires": { - "boom": "5.2.0" + "boom": "5.x.x" }, "dependencies": { "boom": { @@ -140,7 +140,7 @@ "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", "requires": { - "hoek": "4.2.0" + "hoek": "4.x.x" } } } @@ -150,10 +150,10 @@ "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "requires": { - "boolbase": "1.0.0", - "css-what": "2.1.0", + "boolbase": "~1.0.0", + "css-what": "2.1", "domutils": "1.5.1", - "nth-check": "1.0.1" + "nth-check": "~1.0.1" } }, "css-what": { @@ -166,7 +166,7 @@ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "delayed-stream": { @@ -179,8 +179,8 @@ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.1" + "domelementtype": "~1.1.1", + "entities": "~1.1.1" }, "dependencies": { "domelementtype": { @@ -200,7 +200,7 @@ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz", "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=", "requires": { - "domelementtype": "1.3.0" + "domelementtype": "1" } }, "domutils": { @@ -208,8 +208,8 @@ "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.3.0" + "dom-serializer": "0", + "domelementtype": "1" } }, "ecc-jsbn": { @@ -218,7 +218,7 @@ "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "~0.1.0" } }, "entities": { @@ -256,9 +256,9 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz", "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=", "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.17" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.5", + "mime-types": "^2.1.12" } }, "fs-extra": { @@ -266,11 +266,11 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "2.4.0", - "klaw": "1.3.1", - "path-is-absolute": "1.0.1", - "rimraf": "2.6.2" + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0", + "path-is-absolute": "^1.0.0", + "rimraf": "^2.2.8" } }, "fs.realpath": { @@ -283,7 +283,7 @@ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "glob": { @@ -291,12 +291,12 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.0.tgz", "integrity": "sha1-Nq3YVtdG0NmeTMJ5e7oa4sZycv0=", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.2", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "graceful-fs": { @@ -314,8 +314,8 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "requires": { - "ajv": "5.5.2", - "har-schema": "2.0.0" + "ajv": "^5.1.0", + "har-schema": "^2.0.0" } }, "hawk": { @@ -323,10 +323,10 @@ "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", "requires": { - "boom": "4.3.1", - "cryptiles": "3.1.2", - "hoek": "4.2.0", - "sntp": "2.1.0" + "boom": "4.x.x", + "cryptiles": "3.x.x", + "hoek": "4.x.x", + "sntp": "2.x.x" } }, "hoek": { @@ -339,12 +339,12 @@ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", "requires": { - "domelementtype": "1.3.0", - "domhandler": "2.4.1", - "domutils": "1.5.1", - "entities": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "2.3.3" + "domelementtype": "^1.3.0", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^2.0.2" } }, "http-signature": { @@ -352,9 +352,9 @@ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.13.1" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "inflight": { @@ -362,8 +362,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -412,7 +412,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.6" } }, "jsprim": { @@ -431,7 +431,7 @@ "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.9" } }, "lodash.assignin": { @@ -504,7 +504,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", "requires": { - "mime-db": "1.30.0" + "mime-db": "~1.30.0" } }, "minimatch": { @@ -512,7 +512,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" } }, "mockery": { @@ -525,7 +525,7 @@ "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", "requires": { - "boolbase": "1.0.0" + "boolbase": "~1.0.0" } }, "oauth-sign": { @@ -538,7 +538,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os": { @@ -581,13 +581,13 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~1.0.6", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.0.3", + "util-deprecate": "~1.0.1" } }, "request": { @@ -595,36 +595,36 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz", "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==", "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.3.1", - "har-validator": "5.0.3", - "hawk": "6.0.2", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.17", - "oauth-sign": "0.8.2", - "performance-now": "2.1.0", - "qs": "6.5.1", - "safe-buffer": "5.1.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.3", - "tunnel-agent": "0.6.0", - "uuid": "3.2.1" + "aws-sign2": "~0.7.0", + "aws4": "^1.6.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.5", + "extend": "~3.0.1", + "forever-agent": "~0.6.1", + "form-data": "~2.3.1", + "har-validator": "~5.0.3", + "hawk": "~6.0.2", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.17", + "oauth-sign": "~0.8.2", + "performance-now": "^2.1.0", + "qs": "~6.5.1", + "safe-buffer": "^5.1.1", + "stringstream": "~0.0.5", + "tough-cookie": "~2.3.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.1.0" } }, "rimraf": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=", "requires": { - "glob": "7.1.0" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -652,7 +652,7 @@ "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", "requires": { - "hoek": "4.2.0" + "hoek": "4.x.x" } }, "sshpk": { @@ -660,27 +660,22 @@ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "tweetnacl": "~0.14.0" } }, - "string": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/string/-/string-3.3.3.tgz", - "integrity": "sha1-XqIRzZLSKOGEKUmQpsyXs2anfLA=" - }, "string_decoder": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "stringstream": { @@ -698,7 +693,7 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", "requires": { - "punycode": "1.4.1" + "punycode": "^1.4.1" } }, "tunnel-agent": { @@ -706,7 +701,7 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -730,9 +725,9 @@ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" } }, "vso-node-api": { @@ -740,7 +735,7 @@ "resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-0.6.1.tgz", "integrity": "sha1-nT3Qao2uL/NoKvjyioRXOaC9ZIE=", "requires": { - "q": "1.5.1" + "q": "^1.0.1" } }, "vsts-task-lib": { @@ -748,14 +743,14 @@ "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-1.1.0.tgz", "integrity": "sha1-hasTGOVmwFWnY9nyUSAXx75CVts=", "requires": { - "glob": "6.0.4", - "minimatch": "3.0.4", - "mockery": "1.7.0", - "node-uuid": "1.4.8", - "q": "1.5.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "vso-node-api": "0.6.1" + "glob": "^6.0.1", + "minimatch": "^3.0.0", + "mockery": "^1.7.0", + "node-uuid": "^1.4.7", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "vso-node-api": "^0.6.1" }, "dependencies": { "glob": { @@ -763,11 +758,11 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "node-uuid": { @@ -785,10 +780,10 @@ "xml2js": { "version": "0.4.19", "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", - "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", + "integrity": "sha1-aGwg8hMgnpSr8NG88e+qKRx4J6c=", "requires": { - "sax": "1.2.4", - "xmlbuilder": "9.0.6" + "sax": ">=0.6.0", + "xmlbuilder": "~9.0.1" } }, "xmlbuilder": { diff --git a/Tasks/Common/codeanalysis-common/package.json b/Tasks/Common/codeanalysis-common/package.json index 7729c964bd70..eb8e027d738f 100644 --- a/Tasks/Common/codeanalysis-common/package.json +++ b/Tasks/Common/codeanalysis-common/package.json @@ -12,7 +12,6 @@ "request": "^2.74.0", "glob": "7.1.0", "os": "^0.1.1", - "string": "^3.3.1", "vsts-task-lib": "1.1.0", "xml2js": "^0.4.17", "cheerio": "^0.22.0", diff --git a/Tasks/Common/codecoverage-tools/cobertura/cobertura.ant.ccenabler.ts b/Tasks/Common/codecoverage-tools/cobertura/cobertura.ant.ccenabler.ts index beb09ff50a98..1b2671d4b1c9 100644 --- a/Tasks/Common/codecoverage-tools/cobertura/cobertura.ant.ccenabler.ts +++ b/Tasks/Common/codecoverage-tools/cobertura/cobertura.ant.ccenabler.ts @@ -3,7 +3,6 @@ import * as util from "../utilities"; import * as tl from "vsts-task-lib/task"; import * as ccc from "../codecoverageconstants"; import * as cc from "../codecoverageenabler"; -import * as str from "string"; import * as path from "path"; export class CoberturaAntCodeCoverageEnabler extends cc.CoberturaCodeCoverageEnabler { @@ -18,7 +17,7 @@ export class CoberturaAntCodeCoverageEnabler extends cc.CoberturaCodeCoverageEna // ----------------------------------------------------- // Enable code coverage for Cobertura Ant Builds // - enableCodeCoverage: CodeCoverageProperties - ccProps - // ----------------------------------------------------- + // ----------------------------------------------------- public enableCodeCoverage(ccProps: { [name: string]: string }): Q.Promise { let _this = this; @@ -29,7 +28,7 @@ export class CoberturaAntCodeCoverageEnabler extends cc.CoberturaCodeCoverageEna _this.buildFile = ccProps["buildfile"]; let classFilter = ccProps["classfilter"]; let srcDirs = ccProps["sourcedirectories"]; - if (str(srcDirs).isEmpty()) { + if (util.isNullOrWhitespace(srcDirs)) { srcDirs = "."; } _this.sourceDirs = srcDirs; @@ -50,9 +49,9 @@ export class CoberturaAntCodeCoverageEnabler extends cc.CoberturaCodeCoverageEna let ccfilter = []; if (!util.isNullOrWhitespace(filter)) { - str(util.trimToEmptyString(filter)).replaceAll(".", "/").s.split(":").forEach(exFilter => { + util.trimToEmptyString(filter).replace(/\./g, "/").s.split(":").forEach(exFilter => { if (exFilter) { - ccfilter.push(str(exFilter).endsWith("*") ? ("**/" + exFilter + "/**") : ("**/" + exFilter + ".class")); + ccfilter.push(exFilter.endsWith("*") ? ("**/" + exFilter + "/**") : ("**/" + exFilter + ".class")); } }); } @@ -66,7 +65,7 @@ export class CoberturaAntCodeCoverageEnabler extends cc.CoberturaCodeCoverageEna let classData = ""; let classDirs = _this.classDirs; - if (str(classDirs).isEmpty()) { + if (util.isNullOrWhitespace(classDirs)) { classDirs = "."; } classDirs.split(",").forEach(cdir => { diff --git a/Tasks/Common/codecoverage-tools/cobertura/cobertura.gradle.ccenabler.ts b/Tasks/Common/codecoverage-tools/cobertura/cobertura.gradle.ccenabler.ts index afedc7deecc9..ba13deb31cc4 100644 --- a/Tasks/Common/codecoverage-tools/cobertura/cobertura.gradle.ccenabler.ts +++ b/Tasks/Common/codecoverage-tools/cobertura/cobertura.gradle.ccenabler.ts @@ -3,14 +3,13 @@ import * as util from "../utilities"; import * as tl from "vsts-task-lib/task"; import * as ccc from "../codecoverageconstants"; import * as cc from "../codecoverageenabler"; -import * as str from "string"; import * as Q from "q"; export class CoberturaGradleCodeCoverageEnabler extends cc.CoberturaCodeCoverageEnabler { // ----------------------------------------------------- // Enable code coverage for Cobertura Gradle Builds // - enableCodeCoverage: CodeCoverageProperties - ccProps - // ----------------------------------------------------- + // ----------------------------------------------------- public enableCodeCoverage(ccProps: { [name: string]: string }): Q.Promise { let _this = this; @@ -49,7 +48,7 @@ export class CoberturaGradleCodeCoverageEnabler extends cc.CoberturaCodeCoverage if (!util.isNullOrWhitespace(filter)) { util.trimToEmptyString(filter).split(":").forEach(exFilter => { if (exFilter) { - ccfilter.push(str(exFilter).endsWith("*") ? ("'.*" + util.trimEnd(exFilter, "*") + ".*'") : ("'.*" + exFilter + "'")); + ccfilter.push(exFilter.endsWith("*") ? ("'.*" + util.trimEnd(exFilter, "*") + ".*'") : ("'.*" + exFilter + "'")); } }); } diff --git a/Tasks/Common/codecoverage-tools/cobertura/cobertura.maven.ccenabler.ts b/Tasks/Common/codecoverage-tools/cobertura/cobertura.maven.ccenabler.ts index e2a8f3f1df02..3cff3b891ad8 100644 --- a/Tasks/Common/codecoverage-tools/cobertura/cobertura.maven.ccenabler.ts +++ b/Tasks/Common/codecoverage-tools/cobertura/cobertura.maven.ccenabler.ts @@ -3,7 +3,6 @@ import * as util from "../utilities"; import * as tl from "vsts-task-lib/task"; import * as ccc from "../codecoverageconstants"; import * as cc from "../codecoverageenabler"; -import * as str from "string"; import * as Q from "q"; export class CoberturaMavenCodeCoverageEnabler extends cc.CoberturaCodeCoverageEnabler { @@ -13,7 +12,7 @@ export class CoberturaMavenCodeCoverageEnabler extends cc.CoberturaCodeCoverageE // ----------------------------------------------------- // Enable code coverage for Cobertura Maven Builds // - enableCodeCoverage: CodeCoverageProperties - ccProps - // ----------------------------------------------------- + // ----------------------------------------------------- public enableCodeCoverage(ccProps: { [name: string]: string }): Q.Promise { let _this = this; @@ -38,9 +37,9 @@ export class CoberturaMavenCodeCoverageEnabler extends cc.CoberturaCodeCoverageE let ccfilter = []; if (!util.isNullOrWhitespace(filter)) { - str(util.trimToEmptyString(filter)).replaceAll(".", "/").s.split(":").forEach(exFilter => { + util.trimToEmptyString(filter).replace(/\./g, "/").s.split(":").forEach(exFilter => { if (exFilter) { - ccfilter.push(str(exFilter).endsWith("*") ? (exFilter + "/**") : (exFilter + ".class")); + ccfilter.push(exFilter.endsWith("*") ? (exFilter + "/**") : (exFilter + ".class")); } }); } diff --git a/Tasks/Common/codecoverage-tools/codecoverageconstants.ts b/Tasks/Common/codecoverage-tools/codecoverageconstants.ts index a81c762f87d1..d24cabd41a3b 100644 --- a/Tasks/Common/codecoverage-tools/codecoverageconstants.ts +++ b/Tasks/Common/codecoverage-tools/codecoverageconstants.ts @@ -2,7 +2,6 @@ import * as path from "path"; import * as util from "./utilities"; import * as os from "os"; -import * as str from "string"; // Enable Jacoco Code Coverage for Gradle builds using this props @@ -19,16 +18,16 @@ allprojects { def jacocoExcludes = [${excludeFilter}] def jacocoIncludes = [${includeFilter}] -subprojects { +subprojects { jacocoTestReport { doFirst { classDirectories = fileTree(dir: "${classFileDirectory}").exclude(jacocoExcludes).include(jacocoIncludes) } - + reports { html.enabled = true html.destination "\${buildDir}/jacocoHtml" - xml.enabled = true + xml.enabled = true xml.destination "\${buildDir}/summary.xml" } } @@ -45,7 +44,7 @@ task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) { executionData = files(subprojects.jacocoTestReport.executionData) sourceDirectories = files(subprojects.sourceSets.main.allSource.srcDirs) classDirectories = files() - + doFirst { subprojects.each { if (new File("\${it.sourceSets.main.output.classesDir}").exists()) { @@ -57,10 +56,10 @@ task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) { } } } - + reports { html.enabled = true - xml.enabled = true + xml.enabled = true xml.destination "${reportDir}/summary.xml" html.destination "${reportDir}/" } @@ -79,20 +78,20 @@ allprojects { def jacocoExcludes = [${excludeFilter}] def jacocoIncludes = [${includeFilter}] - + jacocoTestReport { doFirst { classDirectories = fileTree(dir: "${classFileDirectory}").exclude(jacocoExcludes).include(jacocoIncludes) } - + reports { html.enabled = true - xml.enabled = true + xml.enabled = true xml.destination "${reportDir}/summary.xml" html.destination "${reportDir}" } } - + test { finalizedBy jacocoTestReport jacoco { @@ -118,7 +117,7 @@ allprojects { mavenCentral() } apply plugin: 'net.saliman.cobertura' - + dependencies { testCompile 'org.slf4j:slf4j-api:1.7.12' } @@ -141,7 +140,7 @@ allprojects { mavenCentral() } apply plugin: 'net.saliman.cobertura' - + dependencies { testCompile 'org.slf4j:slf4j-api:1.7.12' } @@ -149,12 +148,12 @@ allprojects { cobertura.coverageIncludes = [${includeFilter}] cobertura.coverageExcludes = [${excludeFilter}] } - + test { dependsOn = subprojects.test } -cobertura { +cobertura { coverageSourceDirs = []`; if (classDir) { @@ -239,7 +238,7 @@ export function jacocoMavenMultiModuleReport(reportDir: string, srcData: string, classNode += ` />` + os.EOL; }); let srcNode = ""; - if (str(srcData).isEmpty()) { + if (util.isNullOrWhitespace(srcData)) { srcNode = ``; } else { srcData.split(",").forEach(c => { @@ -312,12 +311,12 @@ export function jacocoMavenMultiModuleReport(reportDir: string, srcData: string, export function coberturaMavenEnable(includeFilter: string, excludeFilter: string, aggregate: string): Q.Promise { let includeTag = ""; let excludeTag = ""; - if (!str(excludeFilter).isEmpty()) { + if (!util.isNullOrWhitespace(excludeFilter)) { excludeFilter.split(",").forEach(ex => { excludeTag += `${ex}` + os.EOL; }); } - if (!str(includeFilter).isEmpty()) { + if (!util.isNullOrWhitespace(includeFilter)) { includeFilter.split(",").forEach(ex => { includeTag += `${ex}` + os.EOL; }); diff --git a/Tasks/Common/codecoverage-tools/jacoco/jacoco.ant.ccenabler.ts b/Tasks/Common/codecoverage-tools/jacoco/jacoco.ant.ccenabler.ts index 4b519c27dfdf..dc6bcf678689 100644 --- a/Tasks/Common/codecoverage-tools/jacoco/jacoco.ant.ccenabler.ts +++ b/Tasks/Common/codecoverage-tools/jacoco/jacoco.ant.ccenabler.ts @@ -3,7 +3,6 @@ import * as util from "../utilities"; import * as tl from "vsts-task-lib/task"; import * as ccc from "../codecoverageconstants"; import * as cc from "../codecoverageenabler"; -import * as str from "string"; import * as os from "os"; import * as Q from "q"; import * as path from "path"; @@ -22,7 +21,7 @@ export class JacocoAntCodeCoverageEnabler extends cc.JacocoCodeCoverageEnabler { // ----------------------------------------------------- // Enable code coverage for Jacoco Ant Builds // - enableCodeCoverage: CodeCoverageProperties - ccProps - // ----------------------------------------------------- + // ----------------------------------------------------- public enableCodeCoverage(ccProps: { [name: string]: string }): Q.Promise { let _this = this; @@ -52,9 +51,9 @@ export class JacocoAntCodeCoverageEnabler extends cc.JacocoCodeCoverageEnabler { let ccfilter = []; if (!util.isNullOrWhitespace(filter)) { - str(util.trimToEmptyString(filter)).replaceAll(".", "/").s.split(":").forEach(exFilter => { + util.trimToEmptyString(filter).replace(/\./g, "/").s.split(":").forEach(exFilter => { if (exFilter) { - ccfilter.push(str(exFilter).endsWith("*") ? ("**/" + exFilter + "/**") : ("**/" + exFilter + ".class")); + ccfilter.push(exFilter.endsWith("*") ? ("**/" + exFilter + "/**") : ("**/" + exFilter + ".class")); } }); } @@ -67,12 +66,12 @@ export class JacocoAntCodeCoverageEnabler extends cc.JacocoCodeCoverageEnabler { let srcData = ""; let srcDirs = this.sourceDirs === null ? "" : this.sourceDirs; srcDirs.split(",").forEach(dir => { - if (!str(dir).isEmpty()) { + if (!util.isNullOrWhitespace(dir)) { srcData += ``; srcData += os.EOL; } }); - if (str(srcData).isEmpty()) { + if (util.isNullOrWhitespace(srcData)) { srcData = ``; srcData += os.EOL; } @@ -92,7 +91,7 @@ export class JacocoAntCodeCoverageEnabler extends cc.JacocoCodeCoverageEnabler { classData += `/>`; classData += os.EOL; }); - if (str(classData).isEmpty()) { + if (util.isNullOrWhitespace(classData)) { classData += ``; classData += os.EOL; } @@ -145,10 +144,10 @@ export class JacocoAntCodeCoverageEnabler extends cc.JacocoCodeCoverageEnabler { let testNodes = ["junit", "java", "testng", "batchtest"]; let coverageNode = ccc.jacocoAntCoverageEnable(_this.reportDir); - if (!str(_this.includeFilter).isEmpty()) { + if (!util.isNullOrWhitespace(_this.includeFilter)) { coverageNode.$.includes = _this.includeFilterExec; } - if (!str(_this.excludeFilter).isEmpty()) { + if (!util.isNullOrWhitespace(_this.excludeFilter)) { coverageNode.$.excludes = _this.excludeFilterExec; } diff --git a/Tasks/Common/codecoverage-tools/jacoco/jacoco.gradle.ccenabler.ts b/Tasks/Common/codecoverage-tools/jacoco/jacoco.gradle.ccenabler.ts index 472f173593ab..5d0e81331c39 100644 --- a/Tasks/Common/codecoverage-tools/jacoco/jacoco.gradle.ccenabler.ts +++ b/Tasks/Common/codecoverage-tools/jacoco/jacoco.gradle.ccenabler.ts @@ -3,14 +3,13 @@ import * as util from "../utilities"; import * as tl from "vsts-task-lib/task"; import * as ccc from "../codecoverageconstants"; import * as cc from "../codecoverageenabler"; -import * as str from "string"; import * as Q from "q"; export class JacocoGradleCodeCoverageEnabler extends cc.JacocoCodeCoverageEnabler { // ----------------------------------------------------- // Enable code coverage for Jacoco Gradle Builds // - enableCodeCoverage: CodeCoverageProperties - ccProps - // ----------------------------------------------------- + // ----------------------------------------------------- public enableCodeCoverage(ccProps: { [name: string]: string }): Q.Promise { let _this = this; @@ -48,9 +47,9 @@ export class JacocoGradleCodeCoverageEnabler extends cc.JacocoCodeCoverageEnable let ccfilter = []; if (!util.isNullOrWhitespace(filter)) { - str(util.trimToEmptyString(filter)).replaceAll(".", "/").s.split(":").forEach(exFilter => { + util.trimToEmptyString(filter).replace(/\./g, "/").s.split(":").forEach(exFilter => { if (exFilter) { - ccfilter.push(str(exFilter).endsWith("*") ? ("'" + exFilter + "/**'") : ("'" + exFilter + ".class'")); + ccfilter.push(exFilter.endsWith("*") ? ("'" + exFilter + "/**'") : ("'" + exFilter + ".class'")); } }); } diff --git a/Tasks/Common/codecoverage-tools/jacoco/jacoco.maven.ccenabler.ts b/Tasks/Common/codecoverage-tools/jacoco/jacoco.maven.ccenabler.ts index ce19cf8936a1..bd7b7f325dd4 100644 --- a/Tasks/Common/codecoverage-tools/jacoco/jacoco.maven.ccenabler.ts +++ b/Tasks/Common/codecoverage-tools/jacoco/jacoco.maven.ccenabler.ts @@ -3,7 +3,6 @@ import * as util from "../utilities"; import * as tl from "vsts-task-lib/task"; import * as ccc from "../codecoverageconstants"; import * as cc from "../codecoverageenabler"; -import * as str from "string"; import * as Q from "q"; export class JacocoMavenCodeCoverageEnabler extends cc.JacocoCodeCoverageEnabler { @@ -18,7 +17,7 @@ export class JacocoMavenCodeCoverageEnabler extends cc.JacocoCodeCoverageEnabler // ----------------------------------------------------- // Enable code coverage for Jacoco Maven Builds // - enableCodeCoverage: CodeCoverageProperties - ccProps - // ----------------------------------------------------- + // ----------------------------------------------------- public enableCodeCoverage(ccProps: { [name: string]: string }): Q.Promise { let _this = this; @@ -46,9 +45,9 @@ export class JacocoMavenCodeCoverageEnabler extends cc.JacocoCodeCoverageEnabler let ccfilter = []; if (!util.isNullOrWhitespace(filter)) { - str(util.trimToEmptyString(filter)).replaceAll(".", "/").s.split(":").forEach(exFilter => { + util.trimToEmptyString(filter).replace(/\./g, "/").s.split(":").forEach(exFilter => { if (exFilter) { - ccfilter.push(str(exFilter).endsWith("*") ? ("**/" + exFilter + "/**") : ("**/" + exFilter + ".class")); + ccfilter.push(exFilter.endsWith("*") ? ("**/" + exFilter + "/**") : ("**/" + exFilter + ".class")); } }); } @@ -136,10 +135,10 @@ export class JacocoMavenCodeCoverageEnabler extends cc.JacocoCodeCoverageEnabler let includeFilter = _this.includeFilter.join(","); let excludeFilter = _this.excludeFilter.join(","); - if (str(srcDirs).isEmpty()) { + if (util.isNullOrWhitespace(srcDirs)) { srcDirs = "."; } - if (str(classDirs).isEmpty()) { + if (util.isNullOrWhitespace(classDirs)) { classDirs = "."; } diff --git a/Tasks/Common/codecoverage-tools/package-lock.json b/Tasks/Common/codecoverage-tools/package-lock.json index 7d8a3ae8f93a..d9e09b9f4a0e 100644 --- a/Tasks/Common/codecoverage-tools/package-lock.json +++ b/Tasks/Common/codecoverage-tools/package-lock.json @@ -19,7 +19,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -28,22 +28,22 @@ "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=", "requires": { - "css-select": "1.2.0", - "dom-serializer": "0.1.0", - "entities": "1.1.1", - "htmlparser2": "3.9.2", - "lodash.assignin": "4.2.0", - "lodash.bind": "4.2.1", - "lodash.defaults": "4.2.0", - "lodash.filter": "4.6.0", - "lodash.flatten": "4.4.0", - "lodash.foreach": "4.5.0", - "lodash.map": "4.6.0", - "lodash.merge": "4.6.1", - "lodash.pick": "4.4.0", - "lodash.reduce": "4.6.0", - "lodash.reject": "4.6.0", - "lodash.some": "4.6.0" + "css-select": "~1.2.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "^3.9.1", + "lodash.assignin": "^4.0.9", + "lodash.bind": "^4.1.4", + "lodash.defaults": "^4.0.1", + "lodash.filter": "^4.4.0", + "lodash.flatten": "^4.2.0", + "lodash.foreach": "^4.3.0", + "lodash.map": "^4.4.0", + "lodash.merge": "^4.4.0", + "lodash.pick": "^4.2.1", + "lodash.reduce": "^4.4.0", + "lodash.reject": "^4.4.0", + "lodash.some": "^4.4.0" } }, "concat-map": { @@ -61,10 +61,10 @@ "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "requires": { - "boolbase": "1.0.0", - "css-what": "2.1.0", + "boolbase": "~1.0.0", + "css-what": "2.1", "domutils": "1.5.1", - "nth-check": "1.0.1" + "nth-check": "~1.0.1" } }, "css-what": { @@ -77,8 +77,8 @@ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.1" + "domelementtype": "~1.1.1", + "entities": "~1.1.1" }, "dependencies": { "domelementtype": { @@ -98,7 +98,7 @@ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz", "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=", "requires": { - "domelementtype": "1.3.0" + "domelementtype": "1" } }, "domutils": { @@ -106,8 +106,8 @@ "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.3.0" + "dom-serializer": "0", + "domelementtype": "1" } }, "entities": { @@ -120,11 +120,11 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "2.4.0", - "klaw": "1.3.1", - "path-is-absolute": "1.0.1", - "rimraf": "2.6.2" + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0", + "path-is-absolute": "^1.0.0", + "rimraf": "^2.2.8" } }, "fs.realpath": { @@ -135,14 +135,14 @@ "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "graceful-fs": { @@ -155,12 +155,12 @@ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", "requires": { - "domelementtype": "1.3.0", - "domhandler": "2.4.1", - "domutils": "1.5.1", - "entities": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "2.3.3" + "domelementtype": "^1.3.0", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^2.0.2" } }, "inflight": { @@ -168,8 +168,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -187,7 +187,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.6" } }, "klaw": { @@ -195,7 +195,7 @@ "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.9" } }, "lodash.assignin": { @@ -261,9 +261,9 @@ "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" } }, "mockery": { @@ -281,7 +281,7 @@ "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", "requires": { - "boolbase": "1.0.0" + "boolbase": "~1.0.0" } }, "once": { @@ -289,7 +289,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os": { @@ -315,34 +315,34 @@ "readable-stream": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~1.0.6", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.0.3", + "util-deprecate": "~1.0.1" } }, "rimraf": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=", "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=" }, "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=" }, "semver": { "version": "5.5.0", @@ -354,17 +354,12 @@ "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz", "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=" }, - "string": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/string/-/string-3.3.3.tgz", - "integrity": "sha1-XqIRzZLSKOGEKUmQpsyXs2anfLA=" - }, "string_decoder": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "strip-bom": { @@ -382,7 +377,7 @@ "resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-0.6.1.tgz", "integrity": "sha1-nT3Qao2uL/NoKvjyioRXOaC9ZIE=", "requires": { - "q": "1.5.1" + "q": "^1.0.1" } }, "vsts-task-lib": { @@ -390,14 +385,14 @@ "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-0.9.20.tgz", "integrity": "sha1-MbFJAXkbOyFytAiZDF4bzop57Zs=", "requires": { - "glob": "6.0.4", - "minimatch": "3.0.4", - "mockery": "1.7.0", - "node-uuid": "1.4.8", - "q": "1.5.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "vso-node-api": "0.6.1" + "glob": "^6.0.1", + "minimatch": "^3.0.0", + "mockery": "^1.7.0", + "node-uuid": "^1.4.7", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "vso-node-api": "^0.6.1" }, "dependencies": { "glob": { @@ -405,11 +400,11 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } @@ -422,10 +417,10 @@ "xml2js": { "version": "0.4.19", "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", - "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", + "integrity": "sha1-aGwg8hMgnpSr8NG88e+qKRx4J6c=", "requires": { - "sax": "1.2.4", - "xmlbuilder": "9.0.6" + "sax": ">=0.6.0", + "xmlbuilder": "~9.0.1" } }, "xmlbuilder": { diff --git a/Tasks/Common/codecoverage-tools/package.json b/Tasks/Common/codecoverage-tools/package.json index a235ac4ae3ac..af03b5627cd2 100644 --- a/Tasks/Common/codecoverage-tools/package.json +++ b/Tasks/Common/codecoverage-tools/package.json @@ -10,7 +10,6 @@ "dependencies": { "fs-extra": "^0.30.0", "os": "^0.1.1", - "string": "^3.3.1", "vsts-task-lib": "^0.9.7", "xml2js": "^0.4.17", "cheerio": "^0.22.0", diff --git a/Tasks/Common/codecoverage-tools/utilities.ts b/Tasks/Common/codecoverage-tools/utilities.ts index 817161c8fe85..01cb142b82df 100644 --- a/Tasks/Common/codecoverage-tools/utilities.ts +++ b/Tasks/Common/codecoverage-tools/utilities.ts @@ -3,7 +3,6 @@ import * as Q from "q"; import * as fs from "fs"; import * as tl from "vsts-task-lib/task"; import * as path from "path"; -import * as str from "string"; import * as xml2js from "xml2js"; import * as fse from "fs-extra"; import * as cheerio from "cheerio"; @@ -120,7 +119,7 @@ export function trimEnd(data: string, trimChar: string) { return data; } - if (str(data).endsWith(trimChar)) { + if (data.endsWith(trimChar)) { return data.substring(0, data.length - trimChar.length); } else { return data; @@ -146,7 +145,7 @@ export function writeJsonAsXmlFile(filePath: string, jsonContent: any): Q.Promis let builder = new xml2js.Builder(); tl.debug("Writing JSON as XML file: " + filePath); let xml = builder.buildObject(jsonContent); - xml = str(xml).replaceAll(" ", "").s; + xml = xml.replace(/ /g, ""); return writeFile(filePath, xml); } diff --git a/Tasks/GradleV2/package-lock.json b/Tasks/GradleV2/package-lock.json index 058532fefcf2..77f2342a142a 100644 --- a/Tasks/GradleV2/package-lock.json +++ b/Tasks/GradleV2/package-lock.json @@ -9,10 +9,10 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, "asn1": { @@ -51,7 +51,7 @@ "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", "optional": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "boolbase": { @@ -64,7 +64,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -78,22 +78,22 @@ "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=", "requires": { - "css-select": "1.2.0", - "dom-serializer": "0.1.0", - "entities": "1.1.1", - "htmlparser2": "3.9.2", - "lodash.assignin": "4.2.0", - "lodash.bind": "4.2.1", - "lodash.defaults": "4.2.0", - "lodash.filter": "4.6.0", - "lodash.flatten": "4.4.0", - "lodash.foreach": "4.5.0", - "lodash.map": "4.6.0", - "lodash.merge": "4.6.1", - "lodash.pick": "4.4.0", - "lodash.reduce": "4.6.0", - "lodash.reject": "4.6.0", - "lodash.some": "4.6.0" + "css-select": "~1.2.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "^3.9.1", + "lodash.assignin": "^4.0.9", + "lodash.bind": "^4.1.4", + "lodash.defaults": "^4.0.1", + "lodash.filter": "^4.4.0", + "lodash.flatten": "^4.2.0", + "lodash.foreach": "^4.3.0", + "lodash.map": "^4.4.0", + "lodash.merge": "^4.4.0", + "lodash.pick": "^4.2.1", + "lodash.reduce": "^4.4.0", + "lodash.reject": "^4.4.0", + "lodash.some": "^4.4.0" } }, "co": { @@ -104,27 +104,25 @@ "codeanalysis-common": { "version": "file:../../_build/Tasks/Common/codeanalysis-common-1.0.0.tgz", "requires": { - "cheerio": "0.22.0", - "fs-extra": "0.30.0", + "cheerio": "^0.22.0", + "fs-extra": "^0.30.0", "glob": "7.1.0", - "os": "0.1.1", - "request": "2.87.0", - "string": "3.3.3", - "strip-bom": "3.0.0", + "os": "^0.1.1", + "request": "^2.74.0", + "strip-bom": "^3.0.0", "vsts-task-lib": "1.1.0", - "xml2js": "0.4.19" + "xml2js": "^0.4.17" } }, "codecoverage-tools": { "version": "file:../../_build/Tasks/Common/codecoverage-tools-1.0.0.tgz", "requires": { - "cheerio": "0.22.0", - "fs-extra": "0.30.0", - "os": "0.1.1", - "string": "3.3.3", - "strip-bom": "3.0.0", - "vsts-task-lib": "0.9.20", - "xml2js": "0.4.19" + "cheerio": "^0.22.0", + "fs-extra": "^0.30.0", + "os": "^0.1.1", + "strip-bom": "^3.0.0", + "vsts-task-lib": "^0.9.7", + "xml2js": "^0.4.17" }, "dependencies": { "glob": { @@ -132,11 +130,11 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "vsts-task-lib": { @@ -144,14 +142,14 @@ "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-0.9.20.tgz", "integrity": "sha1-MbFJAXkbOyFytAiZDF4bzop57Zs=", "requires": { - "glob": "6.0.4", - "minimatch": "3.0.4", - "mockery": "1.7.0", - "node-uuid": "1.4.8", - "q": "1.5.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "vso-node-api": "0.6.1" + "glob": "^6.0.1", + "minimatch": "^3.0.0", + "mockery": "^1.7.0", + "node-uuid": "^1.4.7", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "vso-node-api": "^0.6.1" } } } @@ -161,7 +159,7 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "concat-map": { @@ -179,10 +177,10 @@ "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "requires": { - "boolbase": "1.0.0", - "css-what": "2.1.0", + "boolbase": "~1.0.0", + "css-what": "2.1", "domutils": "1.5.1", - "nth-check": "1.0.1" + "nth-check": "~1.0.1" } }, "css-what": { @@ -195,7 +193,7 @@ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "delayed-stream": { @@ -208,8 +206,8 @@ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.1" + "domelementtype": "~1.1.1", + "entities": "~1.1.1" }, "dependencies": { "domelementtype": { @@ -229,7 +227,7 @@ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", "requires": { - "domelementtype": "1.3.0" + "domelementtype": "1" } }, "domutils": { @@ -237,8 +235,8 @@ "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.3.0" + "dom-serializer": "0", + "domelementtype": "1" } }, "ecc-jsbn": { @@ -247,7 +245,7 @@ "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "~0.1.0" } }, "entities": { @@ -285,9 +283,9 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "requires": { - "asynckit": "0.4.0", + "asynckit": "^0.4.0", "combined-stream": "1.0.6", - "mime-types": "2.1.18" + "mime-types": "^2.1.12" } }, "fs-extra": { @@ -295,11 +293,11 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "2.4.0", - "klaw": "1.3.1", - "path-is-absolute": "1.0.1", - "rimraf": "2.6.2" + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0", + "path-is-absolute": "^1.0.0", + "rimraf": "^2.2.8" } }, "fs.realpath": { @@ -312,7 +310,7 @@ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "glob": { @@ -320,12 +318,12 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.0.tgz", "integrity": "sha1-Nq3YVtdG0NmeTMJ5e7oa4sZycv0=", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.2", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "graceful-fs": { @@ -343,8 +341,8 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "requires": { - "ajv": "5.5.2", - "har-schema": "2.0.0" + "ajv": "^5.1.0", + "har-schema": "^2.0.0" } }, "htmlparser2": { @@ -352,12 +350,12 @@ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", "requires": { - "domelementtype": "1.3.0", - "domhandler": "2.4.2", - "domutils": "1.5.1", - "entities": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "domelementtype": "^1.3.0", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^2.0.2" } }, "http-signature": { @@ -365,9 +363,9 @@ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.14.1" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "inflight": { @@ -375,8 +373,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -402,7 +400,7 @@ "java-common": { "version": "file:../../_build/Tasks/Common/java-common-1.0.0.tgz", "requires": { - "semver": "5.5.0", + "semver": "^5.1.0", "vsts-task-lib": "1.1.0" } }, @@ -437,7 +435,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.6" } }, "jsprim": { @@ -456,7 +454,7 @@ "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.9" } }, "lodash.assignin": { @@ -529,7 +527,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "requires": { - "mime-db": "1.33.0" + "mime-db": "~1.33.0" } }, "minimatch": { @@ -537,7 +535,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" } }, "mockery": { @@ -555,7 +553,7 @@ "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", "requires": { - "boolbase": "1.0.0" + "boolbase": "~1.0.0" } }, "oauth-sign": { @@ -568,7 +566,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os": { @@ -611,13 +609,13 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "request": { @@ -625,26 +623,26 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.7.0", - "caseless": "0.12.0", - "combined-stream": "1.0.6", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.3.2", - "har-validator": "5.0.3", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", - "oauth-sign": "0.8.2", - "performance-now": "2.1.0", - "qs": "6.5.2", - "safe-buffer": "5.1.2", - "tough-cookie": "2.3.4", - "tunnel-agent": "0.6.0", - "uuid": "3.2.1" + "aws-sign2": "~0.7.0", + "aws4": "^1.6.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.5", + "extend": "~3.0.1", + "forever-agent": "~0.6.1", + "form-data": "~2.3.1", + "har-validator": "~5.0.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.17", + "oauth-sign": "~0.8.2", + "performance-now": "^2.1.0", + "qs": "~6.5.1", + "safe-buffer": "^5.1.1", + "tough-cookie": "~2.3.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.1.0" }, "dependencies": { "uuid": { @@ -659,7 +657,7 @@ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "requires": { - "glob": "7.1.0" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -692,27 +690,22 @@ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "tweetnacl": "~0.14.0" } }, - "string": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/string/-/string-3.3.3.tgz", - "integrity": "sha1-XqIRzZLSKOGEKUmQpsyXs2anfLA=" - }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "strip-bom": { @@ -725,7 +718,7 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "requires": { - "punycode": "1.4.1" + "punycode": "^1.4.1" } }, "tunnel": { @@ -738,7 +731,7 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -764,9 +757,9 @@ } }, "underscore": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.0.tgz", - "integrity": "sha512-4IV1DSSxC1QK48j9ONFK1MoIAKKkbE8i7u55w2R6IqBqbT7A/iG7aZBCR2Bi8piF0Uz+i/MG1aeqLwl/5vqF+A==" + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz", + "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==" }, "util-deprecate": { "version": "1.0.2", @@ -777,20 +770,25 @@ "version": "file:../../_build/Tasks/Common/utility-common-1.0.2.tgz", "requires": { "js-base64": "2.4.3", - "semver": "5.5.0", + "semver": "^5.4.1", "vso-node-api": "6.0.1-preview", "vsts-task-lib": "2.0.6", "vsts-task-tool-lib": "0.4.0" }, "dependencies": { + "uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" + }, "vso-node-api": { "version": "6.0.1-preview", "resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-6.0.1-preview.tgz", "integrity": "sha1-RBprv5s8aNpiTbAeo1y6jwpMLKs=", "requires": { - "q": "1.5.1", + "q": "^1.0.1", "tunnel": "0.0.4", - "underscore": "1.9.0" + "underscore": "^1.8.3" } }, "vsts-task-lib": { @@ -798,29 +796,24 @@ "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.6.tgz", "integrity": "sha1-9sqGS3sDsS23N8nV/2kThGNpEFY=", "requires": { - "minimatch": "3.0.4", - "mockery": "1.7.0", - "q": "1.5.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "uuid": "3.3.0" + "minimatch": "^3.0.0", + "mockery": "^1.7.0", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "uuid": "^3.0.1" } } } }, - "uuid": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz", - "integrity": "sha512-ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw==" - }, "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" } }, "vso-node-api": { @@ -828,7 +821,7 @@ "resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-0.6.1.tgz", "integrity": "sha1-nT3Qao2uL/NoKvjyioRXOaC9ZIE=", "requires": { - "q": "1.5.1" + "q": "^1.0.1" } }, "vsts-task-lib": { @@ -836,14 +829,14 @@ "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-1.1.0.tgz", "integrity": "sha1-hasTGOVmwFWnY9nyUSAXx75CVts=", "requires": { - "glob": "6.0.4", - "minimatch": "3.0.4", - "mockery": "1.7.0", - "node-uuid": "1.4.8", - "q": "1.5.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "vso-node-api": "0.6.1" + "glob": "^6.0.1", + "minimatch": "^3.0.0", + "mockery": "^1.7.0", + "node-uuid": "^1.4.7", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "vso-node-api": "^0.6.1" }, "dependencies": { "glob": { @@ -851,11 +844,11 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } @@ -865,29 +858,29 @@ "resolved": "https://registry.npmjs.org/vsts-task-tool-lib/-/vsts-task-tool-lib-0.4.0.tgz", "integrity": "sha1-zOtRxyh3yWTI5E3p7eovZfyKyPk=", "requires": { - "semver": "5.5.0", - "semver-compare": "1.0.0", - "typed-rest-client": "0.9.0", - "uuid": "3.2.1", + "semver": "^5.3.0", + "semver-compare": "^1.0.0", + "typed-rest-client": "^0.9.0", + "uuid": "^3.0.1", "vsts-task-lib": "2.0.4-preview" }, "dependencies": { "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" }, "vsts-task-lib": { "version": "2.0.4-preview", "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.4-preview.tgz", "integrity": "sha1-nU63UAoL2a1Z429w8iqtxuK6+NI=", "requires": { - "minimatch": "3.0.4", - "mockery": "1.7.0", - "q": "1.5.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "uuid": "3.2.1" + "minimatch": "^3.0.0", + "mockery": "^1.7.0", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "uuid": "^3.0.1" } } } @@ -902,8 +895,8 @@ "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", "integrity": "sha1-aGwg8hMgnpSr8NG88e+qKRx4J6c=", "requires": { - "sax": "1.2.4", - "xmlbuilder": "9.0.6" + "sax": ">=0.6.0", + "xmlbuilder": "~9.0.1" } }, "xmlbuilder": { diff --git a/Tasks/GradleV2/task.json b/Tasks/GradleV2/task.json index 43ec5c5c1fab..aee955d5945d 100644 --- a/Tasks/GradleV2/task.json +++ b/Tasks/GradleV2/task.json @@ -15,8 +15,8 @@ "author": "Microsoft Corporation", "version": { "Major": 2, - "Minor": 137, - "Patch": 1 + "Minor": 139, + "Patch": 0 }, "releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`", "demands": [ diff --git a/Tasks/GradleV2/task.loc.json b/Tasks/GradleV2/task.loc.json index c4ca7bef3078..c5d32195cabe 100644 --- a/Tasks/GradleV2/task.loc.json +++ b/Tasks/GradleV2/task.loc.json @@ -15,8 +15,8 @@ "author": "Microsoft Corporation", "version": { "Major": 2, - "Minor": 137, - "Patch": 1 + "Minor": 139, + "Patch": 0 }, "releaseNotes": "ms-resource:loc.releaseNotes", "demands": [ diff --git a/Tasks/MavenV2/package-lock.json b/Tasks/MavenV2/package-lock.json index d5b21c256b69..539592e3078a 100644 --- a/Tasks/MavenV2/package-lock.json +++ b/Tasks/MavenV2/package-lock.json @@ -9,10 +9,10 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.0.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, "asn1": { @@ -56,7 +56,7 @@ "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", "optional": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "boolbase": { @@ -69,7 +69,7 @@ "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", "requires": { - "hoek": "4.2.0" + "hoek": "4.x.x" } }, "brace-expansion": { @@ -77,7 +77,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -91,22 +91,22 @@ "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=", "requires": { - "css-select": "1.2.0", - "dom-serializer": "0.1.0", - "entities": "1.1.1", - "htmlparser2": "3.9.2", - "lodash.assignin": "4.2.0", - "lodash.bind": "4.2.1", - "lodash.defaults": "4.2.0", - "lodash.filter": "4.6.0", - "lodash.flatten": "4.4.0", - "lodash.foreach": "4.5.0", - "lodash.map": "4.6.0", - "lodash.merge": "4.6.1", - "lodash.pick": "4.4.0", - "lodash.reduce": "4.6.0", - "lodash.reject": "4.6.0", - "lodash.some": "4.6.0" + "css-select": "~1.2.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "^3.9.1", + "lodash.assignin": "^4.0.9", + "lodash.bind": "^4.1.4", + "lodash.defaults": "^4.0.1", + "lodash.filter": "^4.4.0", + "lodash.flatten": "^4.2.0", + "lodash.foreach": "^4.3.0", + "lodash.map": "^4.4.0", + "lodash.merge": "^4.4.0", + "lodash.pick": "^4.2.1", + "lodash.reduce": "^4.4.0", + "lodash.reject": "^4.4.0", + "lodash.some": "^4.4.0" } }, "co": { @@ -117,27 +117,25 @@ "codeanalysis-common": { "version": "file:../../_build/Tasks/Common/codeanalysis-common-1.0.0.tgz", "requires": { - "cheerio": "0.22.0", - "fs-extra": "0.30.0", + "cheerio": "^0.22.0", + "fs-extra": "^0.30.0", "glob": "7.1.0", - "os": "0.1.1", - "request": "2.83.0", - "string": "3.3.3", - "strip-bom": "3.0.0", + "os": "^0.1.1", + "request": "^2.74.0", + "strip-bom": "^3.0.0", "vsts-task-lib": "1.1.0", - "xml2js": "0.4.19" + "xml2js": "^0.4.17" } }, "codecoverage-tools": { "version": "file:../../_build/Tasks/Common/codecoverage-tools-1.0.0.tgz", "requires": { - "cheerio": "0.22.0", - "fs-extra": "0.30.0", - "os": "0.1.1", - "string": "3.3.3", - "strip-bom": "3.0.0", - "vsts-task-lib": "0.9.20", - "xml2js": "0.4.19" + "cheerio": "^0.22.0", + "fs-extra": "^0.30.0", + "os": "^0.1.1", + "strip-bom": "^3.0.0", + "vsts-task-lib": "^0.9.7", + "xml2js": "^0.4.17" }, "dependencies": { "glob": { @@ -145,11 +143,11 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "vso-node-api": { @@ -157,7 +155,7 @@ "resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-0.6.1.tgz", "integrity": "sha1-nT3Qao2uL/NoKvjyioRXOaC9ZIE=", "requires": { - "q": "1.5.1" + "q": "^1.0.1" } }, "vsts-task-lib": { @@ -165,14 +163,14 @@ "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-0.9.20.tgz", "integrity": "sha1-MbFJAXkbOyFytAiZDF4bzop57Zs=", "requires": { - "glob": "6.0.4", - "minimatch": "3.0.4", - "mockery": "1.7.0", - "node-uuid": "1.4.8", - "q": "1.5.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "vso-node-api": "0.6.1" + "glob": "^6.0.1", + "minimatch": "^3.0.0", + "mockery": "^1.7.0", + "node-uuid": "^1.4.7", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "vso-node-api": "^0.6.1" } } } @@ -182,7 +180,7 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "concat-map": { @@ -200,7 +198,7 @@ "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", "requires": { - "boom": "5.2.0" + "boom": "5.x.x" }, "dependencies": { "boom": { @@ -208,7 +206,7 @@ "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", "integrity": "sha1-XdnabuOl8wIHdDYpDLcX0/SlTgI=", "requires": { - "hoek": "4.2.0" + "hoek": "4.x.x" } } } @@ -218,10 +216,10 @@ "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "requires": { - "boolbase": "1.0.0", - "css-what": "2.1.0", + "boolbase": "~1.0.0", + "css-what": "2.1", "domutils": "1.5.1", - "nth-check": "1.0.1" + "nth-check": "~1.0.1" } }, "css-what": { @@ -234,7 +232,7 @@ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "delayed-stream": { @@ -247,8 +245,8 @@ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.1" + "domelementtype": "~1.1.1", + "entities": "~1.1.1" }, "dependencies": { "domelementtype": { @@ -268,7 +266,7 @@ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz", "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=", "requires": { - "domelementtype": "1.3.0" + "domelementtype": "1" } }, "domutils": { @@ -276,8 +274,8 @@ "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.3.0" + "dom-serializer": "0", + "domelementtype": "1" } }, "ecc-jsbn": { @@ -286,7 +284,7 @@ "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "~0.1.0" } }, "entities": { @@ -324,9 +322,9 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz", "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=", "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.17" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.5", + "mime-types": "^2.1.12" } }, "fs-extra": { @@ -334,11 +332,11 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "2.4.0", - "klaw": "1.3.1", - "path-is-absolute": "1.0.1", - "rimraf": "2.6.2" + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0", + "path-is-absolute": "^1.0.0", + "rimraf": "^2.2.8" } }, "fs.realpath": { @@ -351,7 +349,7 @@ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "glob": { @@ -359,12 +357,12 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.0.tgz", "integrity": "sha1-Nq3YVtdG0NmeTMJ5e7oa4sZycv0=", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.2", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "graceful-fs": { @@ -382,8 +380,8 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "requires": { - "ajv": "5.5.2", - "har-schema": "2.0.0" + "ajv": "^5.1.0", + "har-schema": "^2.0.0" } }, "hawk": { @@ -391,10 +389,10 @@ "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", "integrity": "sha1-r02RTrBl+bXOTZ0RwcshJu7MMDg=", "requires": { - "boom": "4.3.1", - "cryptiles": "3.1.2", - "hoek": "4.2.0", - "sntp": "2.1.0" + "boom": "4.x.x", + "cryptiles": "3.x.x", + "hoek": "4.x.x", + "sntp": "2.x.x" } }, "hoek": { @@ -407,12 +405,12 @@ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", "requires": { - "domelementtype": "1.3.0", - "domhandler": "2.4.1", - "domutils": "1.5.1", - "entities": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "2.3.3" + "domelementtype": "^1.3.0", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^2.0.2" } }, "http-signature": { @@ -420,9 +418,9 @@ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.13.1" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "inflight": { @@ -430,8 +428,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -457,7 +455,7 @@ "java-common": { "version": "file:../../_build/Tasks/Common/java-common-1.0.0.tgz", "requires": { - "semver": "5.5.0", + "semver": "^5.1.0", "vsts-task-lib": "1.1.0" } }, @@ -492,7 +490,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.6" } }, "jsprim": { @@ -511,7 +509,7 @@ "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.9" } }, "lodash.assignin": { @@ -579,7 +577,7 @@ "resolved": "https://registry.npmjs.org/ltx/-/ltx-2.7.1.tgz", "integrity": "sha1-Dly9y1vxeM+ngx6kHcMj2XQiMVo=", "requires": { - "inherits": "2.0.3" + "inherits": "^2.0.1" } }, "mime-db": { @@ -592,7 +590,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", "requires": { - "mime-db": "1.30.0" + "mime-db": "~1.30.0" } }, "minimatch": { @@ -600,7 +598,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" } }, "mockery": { @@ -618,18 +616,18 @@ "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", "requires": { - "boolbase": "1.0.0" + "boolbase": "~1.0.0" } }, "nuget-task-common": { "version": "file:../../_build/Tasks/Common/nuget-task-common-1.0.1.tgz", "requires": { - "ltx": "2.7.1", - "mockery": "1.7.0", - "vso-node-api": "5.1.2", + "ltx": "^2.6.2", + "mockery": "^1.7.0", + "vso-node-api": "^5.0.5", "vsts-task-lib": "2.0.6", "vsts-task-tool-lib": "0.4.1", - "xmlreader": "0.2.3" + "xmlreader": "^0.2.3" }, "dependencies": { "vso-node-api": { @@ -637,9 +635,9 @@ "resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-5.1.2.tgz", "integrity": "sha1-gXtm/+1uEcvXH5O5FvSxicljQls=", "requires": { - "q": "1.5.1", + "q": "^1.0.1", "tunnel": "0.0.4", - "underscore": "1.8.3" + "underscore": "^1.8.3" } }, "vsts-task-lib": { @@ -647,12 +645,12 @@ "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.6.tgz", "integrity": "sha1-9sqGS3sDsS23N8nV/2kThGNpEFY=", "requires": { - "minimatch": "3.0.4", - "mockery": "1.7.0", - "q": "1.5.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "uuid": "3.2.1" + "minimatch": "^3.0.0", + "mockery": "^1.7.0", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "uuid": "^3.0.1" } } } @@ -667,7 +665,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os": { @@ -710,13 +708,13 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~1.0.6", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.0.3", + "util-deprecate": "~1.0.1" } }, "request": { @@ -724,28 +722,28 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz", "integrity": "sha1-ygtl2gLtYpNYh4COb1EDgQNOM1Y=", "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.3.1", - "har-validator": "5.0.3", - "hawk": "6.0.2", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.17", - "oauth-sign": "0.8.2", - "performance-now": "2.1.0", - "qs": "6.5.1", - "safe-buffer": "5.1.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.3", - "tunnel-agent": "0.6.0", - "uuid": "3.2.1" + "aws-sign2": "~0.7.0", + "aws4": "^1.6.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.5", + "extend": "~3.0.1", + "forever-agent": "~0.6.1", + "form-data": "~2.3.1", + "har-validator": "~5.0.3", + "hawk": "~6.0.2", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.17", + "oauth-sign": "~0.8.2", + "performance-now": "^2.1.0", + "qs": "~6.5.1", + "safe-buffer": "^5.1.1", + "stringstream": "~0.0.5", + "tough-cookie": "~2.3.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.1.0" } }, "rimraf": { @@ -753,7 +751,7 @@ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=", "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" }, "dependencies": { "glob": { @@ -761,12 +759,12 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } @@ -801,7 +799,7 @@ "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", "integrity": "sha1-LGzsFP7cIiJznK+bXD2F0cxaLMg=", "requires": { - "hoek": "4.2.0" + "hoek": "4.x.x" } }, "sshpk": { @@ -809,27 +807,22 @@ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "tweetnacl": "~0.14.0" } }, - "string": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/string/-/string-3.3.3.tgz", - "integrity": "sha1-XqIRzZLSKOGEKUmQpsyXs2anfLA=" - }, "string_decoder": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "stringstream": { @@ -847,7 +840,7 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", "requires": { - "punycode": "1.4.1" + "punycode": "^1.4.1" } }, "tunnel": { @@ -860,7 +853,7 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -897,7 +890,7 @@ "version": "file:../../_build/Tasks/Common/utility-common-1.0.2.tgz", "requires": { "js-base64": "2.4.3", - "semver": "5.5.0", + "semver": "^5.4.1", "vso-node-api": "6.0.1-preview", "vsts-task-lib": "2.0.6", "vsts-task-tool-lib": "0.4.0" @@ -917,12 +910,12 @@ "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.6.tgz", "integrity": "sha1-9sqGS3sDsS23N8nV/2kThGNpEFY=", "requires": { - "minimatch": "3.0.4", - "mockery": "1.7.0", - "q": "1.5.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "uuid": "3.2.1" + "minimatch": "^3.0.0", + "mockery": "^1.7.0", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "uuid": "^3.0.1" } }, "vsts-task-tool-lib": { @@ -930,10 +923,10 @@ "resolved": "https://registry.npmjs.org/vsts-task-tool-lib/-/vsts-task-tool-lib-0.4.0.tgz", "integrity": "sha1-zOtRxyh3yWTI5E3p7eovZfyKyPk=", "requires": { - "semver": "5.5.0", - "semver-compare": "1.0.0", - "typed-rest-client": "0.9.0", - "uuid": "3.2.1", + "semver": "^5.3.0", + "semver-compare": "^1.0.0", + "typed-rest-client": "^0.9.0", + "uuid": "^3.0.1", "vsts-task-lib": "2.0.4-preview" }, "dependencies": { @@ -942,12 +935,12 @@ "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.0.4-preview.tgz", "integrity": "sha1-nU63UAoL2a1Z429w8iqtxuK6+NI=", "requires": { - "minimatch": "3.0.4", - "mockery": "1.7.0", - "q": "1.5.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "uuid": "3.2.1" + "minimatch": "^3.0.0", + "mockery": "^1.7.0", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "uuid": "^3.0.1" } } } @@ -964,9 +957,9 @@ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" } }, "vso-node-api": { @@ -974,9 +967,9 @@ "resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-6.0.1-preview.tgz", "integrity": "sha1-RBprv5s8aNpiTbAeo1y6jwpMLKs=", "requires": { - "q": "1.5.1", + "q": "^1.0.1", "tunnel": "0.0.4", - "underscore": "1.8.3" + "underscore": "^1.8.3" } }, "vsts-task-lib": { @@ -984,14 +977,14 @@ "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-1.1.0.tgz", "integrity": "sha1-hasTGOVmwFWnY9nyUSAXx75CVts=", "requires": { - "glob": "6.0.4", - "minimatch": "3.0.4", - "mockery": "1.7.0", - "node-uuid": "1.4.8", - "q": "1.5.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "vso-node-api": "0.6.1" + "glob": "^6.0.1", + "minimatch": "^3.0.0", + "mockery": "^1.7.0", + "node-uuid": "^1.4.7", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "vso-node-api": "^0.6.1" }, "dependencies": { "glob": { @@ -999,11 +992,11 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "vso-node-api": { @@ -1011,7 +1004,7 @@ "resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-0.6.1.tgz", "integrity": "sha1-nT3Qao2uL/NoKvjyioRXOaC9ZIE=", "requires": { - "q": "1.5.1" + "q": "^1.0.1" } } } @@ -1021,29 +1014,24 @@ "resolved": "https://registry.npmjs.org/vsts-task-tool-lib/-/vsts-task-tool-lib-0.4.1.tgz", "integrity": "sha1-mYLTv14YS95SqpdCGJROEGJzRWU=", "requires": { - "semver": "5.5.0", - "semver-compare": "1.0.0", - "typed-rest-client": "0.11.0", - "uuid": "3.2.1", - "vsts-task-lib": "2.2.1" + "semver": "^5.3.0", + "semver-compare": "^1.0.0", + "typed-rest-client": "^0.11.0", + "uuid": "^3.0.1", + "vsts-task-lib": "^2.0.7" }, "dependencies": { - "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" - }, "vsts-task-lib": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.2.1.tgz", - "integrity": "sha512-FYllK73r1K7+sPUtWKZ4tihskJgpGB3YdNX4qr1YO0cmhFAWHm9FfEVxmKdlNeIyDtu3NyRb4wVUz0Gwi5LyGA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.6.0.tgz", + "integrity": "sha512-ja2qX4BIUvswcNbGtIoGo1SM5mRVc3Yaf7oM4oY64bNHs04chKfvH6f3cDDG0pd44OrZIGQE9LgECzeau6z2wA==", "requires": { "minimatch": "3.0.4", - "mockery": "1.7.0", - "q": "1.5.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "uuid": "3.2.1" + "mockery": "^1.7.0", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "uuid": "^3.0.1" } } } @@ -1058,8 +1046,8 @@ "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", "integrity": "sha1-aGwg8hMgnpSr8NG88e+qKRx4J6c=", "requires": { - "sax": "1.2.4", - "xmlbuilder": "9.0.6" + "sax": ">=0.6.0", + "xmlbuilder": "~9.0.1" } }, "xmlbuilder": { @@ -1072,7 +1060,7 @@ "resolved": "https://registry.npmjs.org/xmlreader/-/xmlreader-0.2.3.tgz", "integrity": "sha1-hldutdV5Wabe5+0os8vRw1Wdy5A=", "requires": { - "sax": "0.5.8" + "sax": "~0.5.2" }, "dependencies": { "sax": { diff --git a/Tasks/MavenV2/task.json b/Tasks/MavenV2/task.json index aaa6be7b31b3..e867fc79868a 100644 --- a/Tasks/MavenV2/task.json +++ b/Tasks/MavenV2/task.json @@ -16,8 +16,8 @@ "author": "Microsoft Corporation", "version": { "Major": 2, - "Minor": 137, - "Patch": 1 + "Minor": 139, + "Patch": 0 }, "releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`", "demands": [ diff --git a/Tasks/MavenV2/task.loc.json b/Tasks/MavenV2/task.loc.json index fb34186e92f0..1508ceac74dd 100644 --- a/Tasks/MavenV2/task.loc.json +++ b/Tasks/MavenV2/task.loc.json @@ -16,8 +16,8 @@ "author": "Microsoft Corporation", "version": { "Major": 2, - "Minor": 137, - "Patch": 1 + "Minor": 139, + "Patch": 0 }, "releaseNotes": "ms-resource:loc.releaseNotes", "demands": [ diff --git a/Tasks/PublishCodeCoverageResultsV1/package-lock.json b/Tasks/PublishCodeCoverageResultsV1/package-lock.json index 35a34e50837c..80bfea9d98b0 100644 --- a/Tasks/PublishCodeCoverageResultsV1/package-lock.json +++ b/Tasks/PublishCodeCoverageResultsV1/package-lock.json @@ -17,7 +17,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -26,34 +26,33 @@ "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=", "requires": { - "css-select": "1.2.0", - "dom-serializer": "0.1.0", - "entities": "1.1.1", - "htmlparser2": "3.9.2", - "lodash.assignin": "4.2.0", - "lodash.bind": "4.2.1", - "lodash.defaults": "4.2.0", - "lodash.filter": "4.6.0", - "lodash.flatten": "4.4.0", - "lodash.foreach": "4.5.0", - "lodash.map": "4.6.0", - "lodash.merge": "4.6.1", - "lodash.pick": "4.4.0", - "lodash.reduce": "4.6.0", - "lodash.reject": "4.6.0", - "lodash.some": "4.6.0" + "css-select": "~1.2.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "^3.9.1", + "lodash.assignin": "^4.0.9", + "lodash.bind": "^4.1.4", + "lodash.defaults": "^4.0.1", + "lodash.filter": "^4.4.0", + "lodash.flatten": "^4.2.0", + "lodash.foreach": "^4.3.0", + "lodash.map": "^4.4.0", + "lodash.merge": "^4.4.0", + "lodash.pick": "^4.2.1", + "lodash.reduce": "^4.4.0", + "lodash.reject": "^4.4.0", + "lodash.some": "^4.4.0" } }, "codecoverage-tools": { "version": "file:../../_build/Tasks/Common/codecoverage-tools-1.0.0.tgz", "requires": { - "cheerio": "0.22.0", - "fs-extra": "0.30.0", - "os": "0.1.1", - "string": "3.3.3", - "strip-bom": "3.0.0", - "vsts-task-lib": "0.9.20", - "xml2js": "0.4.19" + "cheerio": "^0.22.0", + "fs-extra": "^0.30.0", + "os": "^0.1.1", + "strip-bom": "^3.0.0", + "vsts-task-lib": "^0.9.7", + "xml2js": "^0.4.17" }, "dependencies": { "glob": { @@ -61,11 +60,11 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "vsts-task-lib": { @@ -73,14 +72,14 @@ "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-0.9.20.tgz", "integrity": "sha1-MbFJAXkbOyFytAiZDF4bzop57Zs=", "requires": { - "glob": "6.0.4", - "minimatch": "3.0.4", - "mockery": "1.7.0", - "node-uuid": "1.4.8", - "q": "1.5.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "vso-node-api": "0.6.1" + "glob": "^6.0.1", + "minimatch": "^3.0.0", + "mockery": "^1.7.0", + "node-uuid": "^1.4.7", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "vso-node-api": "^0.6.1" } } } @@ -100,10 +99,10 @@ "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "requires": { - "boolbase": "1.0.0", - "css-what": "2.1.0", + "boolbase": "~1.0.0", + "css-what": "2.1", "domutils": "1.5.1", - "nth-check": "1.0.1" + "nth-check": "~1.0.1" } }, "css-what": { @@ -116,8 +115,8 @@ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.1" + "domelementtype": "~1.1.1", + "entities": "~1.1.1" }, "dependencies": { "domelementtype": { @@ -133,11 +132,11 @@ "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=" }, "domhandler": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz", - "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", + "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", "requires": { - "domelementtype": "1.3.0" + "domelementtype": "1" } }, "domutils": { @@ -145,8 +144,8 @@ "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.3.0" + "dom-serializer": "0", + "domelementtype": "1" } }, "entities": { @@ -159,11 +158,11 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "2.4.0", - "klaw": "1.3.1", - "path-is-absolute": "1.0.1", - "rimraf": "2.6.2" + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0", + "path-is-absolute": "^1.0.0", + "rimraf": "^2.2.8" } }, "fs.realpath": { @@ -176,12 +175,12 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "graceful-fs": { @@ -194,12 +193,12 @@ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", "requires": { - "domelementtype": "1.3.0", - "domhandler": "2.4.1", - "domutils": "1.5.1", - "entities": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "2.3.3" + "domelementtype": "^1.3.0", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^2.0.2" } }, "inflight": { @@ -207,8 +206,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -226,7 +225,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.6" } }, "klaw": { @@ -234,7 +233,7 @@ "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.9" } }, "lodash.assignin": { @@ -302,7 +301,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" } }, "mockery": { @@ -320,7 +319,7 @@ "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", "requires": { - "boolbase": "1.0.0" + "boolbase": "~1.0.0" } }, "once": { @@ -328,7 +327,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os": { @@ -342,9 +341,9 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" }, "q": { "version": "1.5.1", @@ -352,17 +351,17 @@ "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" }, "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { @@ -370,13 +369,13 @@ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "sax": { "version": "1.2.4", @@ -393,17 +392,12 @@ "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz", "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=" }, - "string": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/string/-/string-3.3.3.tgz", - "integrity": "sha1-XqIRzZLSKOGEKUmQpsyXs2anfLA=" - }, "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "strip-bom": { @@ -421,7 +415,7 @@ "resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-0.6.1.tgz", "integrity": "sha1-nT3Qao2uL/NoKvjyioRXOaC9ZIE=", "requires": { - "q": "1.5.1" + "q": "^1.0.1" } }, "vsts-task-lib": { @@ -429,12 +423,12 @@ "resolved": "https://registry.npmjs.org/vsts-task-lib/-/vsts-task-lib-2.2.1.tgz", "integrity": "sha512-FYllK73r1K7+sPUtWKZ4tihskJgpGB3YdNX4qr1YO0cmhFAWHm9FfEVxmKdlNeIyDtu3NyRb4wVUz0Gwi5LyGA==", "requires": { - "minimatch": "3.0.4", - "mockery": "1.7.0", - "q": "1.5.1", - "semver": "5.5.0", - "shelljs": "0.3.0", - "uuid": "3.2.1" + "minimatch": "^3.0.0", + "mockery": "^1.7.0", + "q": "^1.1.2", + "semver": "^5.1.0", + "shelljs": "^0.3.0", + "uuid": "^3.0.1" }, "dependencies": { "uuid": { @@ -454,14 +448,14 @@ "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", "requires": { - "sax": "1.2.4", - "xmlbuilder": "9.0.6" + "sax": ">=0.6.0", + "xmlbuilder": "~9.0.1" } }, "xmlbuilder": { - "version": "9.0.6", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.6.tgz", - "integrity": "sha1-fIJtjYb0eISwWHLL6dJ7Ab7VA/Y=" + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" } } } \ No newline at end of file diff --git a/Tasks/PublishCodeCoverageResultsV1/task.json b/Tasks/PublishCodeCoverageResultsV1/task.json index 1ac756447235..0ccf2bcd7124 100644 --- a/Tasks/PublishCodeCoverageResultsV1/task.json +++ b/Tasks/PublishCodeCoverageResultsV1/task.json @@ -15,7 +15,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 131, + "Minor": 139, "Patch": 0 }, "demands": [], diff --git a/Tasks/PublishCodeCoverageResultsV1/task.loc.json b/Tasks/PublishCodeCoverageResultsV1/task.loc.json index d3a24d5a0dc0..a2a740b0fb55 100644 --- a/Tasks/PublishCodeCoverageResultsV1/task.loc.json +++ b/Tasks/PublishCodeCoverageResultsV1/task.loc.json @@ -15,7 +15,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 131, + "Minor": 139, "Patch": 0 }, "demands": [],