From acbbf7eeecb6bc6bd1d6c73f129aaa8aba932d75 Mon Sep 17 00:00:00 2001 From: "Kyle E. Mitchell" Date: Thu, 28 Mar 2019 20:03:35 -0700 Subject: [PATCH] licensee@7.0.2 Close: https://github.com/npm/cli/pull/183 --- .licensee.json | 9 ++++++-- package-lock.json | 58 ++++++++++++++++++++++++++++++++--------------- package.json | 2 +- 3 files changed, 48 insertions(+), 21 deletions(-) diff --git a/.licensee.json b/.licensee.json index ad7c812367371..5b815d601ee77 100644 --- a/.licensee.json +++ b/.licensee.json @@ -1,7 +1,12 @@ { - "license": "(MIT OR BSD-2-Clause OR BSD-3-Clause OR Apache-2.0 OR ISC OR Unlicense OR CC-BY-3.0 OR CC0-1.0 OR Artistic-2.0)", + "licenses": { + "spdx": [ + "CC-BY-3.0" + ], + "blueOak": "bronze" + }, "corrections": true, - "whitelist": { + "packages": { "config-chain": "1.1.12", "cyclist": "0.2.2", "json-schema": "0.2.3", diff --git a/package-lock.json b/package-lock.json index 17c2d80d4c6ad..5b5edddc8013e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -130,6 +130,12 @@ "to-fast-properties": "^2.0.0" } }, + "@blueoak/list": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@blueoak/list/-/list-1.0.2.tgz", + "integrity": "sha512-KyqT0kkdxgbGys9mvo/1Mgdt/LGvUFPCZIK9pWPIfOM2mYzMDd/eVYy4sMP1YqvVI129k0alxRyM53H2MAs/Nw==", + "dev": true + }, "@types/caseless": { "version": "0.12.1", "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz", @@ -3262,11 +3268,12 @@ } }, "licensee": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/licensee/-/licensee-6.1.0.tgz", - "integrity": "sha512-z0zTmZmHHXlbHMYYUQncutJ0u19SwaidkMdm4t37jvxuJL3HnxcESfzNfXRYnazi6VwGUUYheZcHw+U9mqYr7A==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/licensee/-/licensee-7.0.2.tgz", + "integrity": "sha512-U30RSe5DI7HfKGM2LNgt/5QP7QEk4leKcRTp/6PorHHDeAoFsZn7SGwR/MKgP3xdk6cTD+G3SBdYwQGcZ1zPfA==", "dev": true, "requires": { + "@blueoak/list": "^1.0.2", "correct-license-metadata": "^1.0.1", "docopt": "^0.6.2", "fs-access": "^2.0.0", @@ -3274,10 +3281,20 @@ "npm-license-corrections": "^1.0.0", "read-package-tree": "^5.2.1", "run-parallel": "^1.1.9", - "semver": "^5.6.0", + "semver": "^6.1.1", "simple-concat": "^1.0.0", + "spdx-expression-parse": "^3.0.0", "spdx-expression-validate": "^2.0.0", - "spdx-satisfies": "^4.0.0" + "spdx-osi": "^3.0.0", + "spdx-whitelisted": "^1.0.0" + }, + "dependencies": { + "semver": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.2.tgz", + "integrity": "sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==", + "dev": true + } } }, "load-json-file": { @@ -4029,7 +4046,7 @@ }, "execa": { "version": "1.0.0", - "resolved": false, + "resolved": "", "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { @@ -4044,7 +4061,7 @@ }, "find-up": { "version": "3.0.0", - "resolved": false, + "resolved": "", "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { @@ -4059,13 +4076,13 @@ }, "invert-kv": { "version": "2.0.0", - "resolved": false, + "resolved": "", "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", "dev": true }, "is-fullwidth-code-point": { "version": "2.0.0", - "resolved": false, + "resolved": "", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, @@ -4081,7 +4098,7 @@ }, "lcid": { "version": "2.0.0", - "resolved": false, + "resolved": "", "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "dev": true, "requires": { @@ -4090,7 +4107,7 @@ }, "locate-path": { "version": "3.0.0", - "resolved": false, + "resolved": "", "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { @@ -4127,7 +4144,7 @@ }, "os-locale": { "version": "3.1.0", - "resolved": false, + "resolved": "", "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "dev": true, "requires": { @@ -4147,7 +4164,7 @@ }, "p-locate": { "version": "3.0.0", - "resolved": false, + "resolved": "", "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { @@ -5360,20 +5377,25 @@ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz", "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==" }, + "spdx-osi": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-osi/-/spdx-osi-3.0.0.tgz", + "integrity": "sha512-7DZMaD/rNHWGf82qWOazBsLXQsaLsoJb9RRjhEUQr5o86kw3A1ErGzSdvaXl+KalZyKkkU5T2a5NjCCutAKQSw==", + "dev": true + }, "spdx-ranges": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/spdx-ranges/-/spdx-ranges-2.1.0.tgz", "integrity": "sha512-OOWghvosfmECc9edy/A9j7GabERmn8bJWHc0J1knVytQtO5Rw7VfxK6CDqmivJhfMJqWhWWUfffNNMPYvyvyQA==", "dev": true }, - "spdx-satisfies": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/spdx-satisfies/-/spdx-satisfies-4.0.1.tgz", - "integrity": "sha512-WVzZ/cXAzoNmjCWiEluEA3BjHp5tiUmmhn9MK+X0tBbR9sOqtC6UQwmgCNrAIZvNlMuBUYAaHYfb2oqlF9SwKA==", + "spdx-whitelisted": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/spdx-whitelisted/-/spdx-whitelisted-1.0.0.tgz", + "integrity": "sha512-X4FOpUCvZuo42MdB1zAZ/wdX4N0lLcWDozf2KYFVDgtLv8Lx+f31LOYLP2/FcwTzsPi64bS/VwKqklI4RBletg==", "dev": true, "requires": { "spdx-compare": "^1.0.0", - "spdx-expression-parse": "^3.0.0", "spdx-ranges": "^2.0.0" } }, diff --git a/package.json b/package.json index 6a4f9fe20e0eb..acdeb22908e06 100644 --- a/package.json +++ b/package.json @@ -269,7 +269,7 @@ "devDependencies": { "deep-equal": "^1.0.1", "get-stream": "^4.1.0", - "licensee": "^6.1.0", + "licensee": "^7.0.2", "marked": "^0.6.0", "marked-man": "^0.2.1", "npm-registry-couchapp": "^2.7.1",