github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade license checker (#16147)

Browse source
This commit is contained in:
Kim Joar Bekkelund 2018-01-19 08:49:55 +01:00 • committed by GitHub
parent 6c66c0c602
commit fa6736f31d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 71 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -278,7 +278,7 @@
"karma-safari-launcher": "1.0.0",
"keymirror": "0.1.1",
"leadfoot": "1.7.1",
"license-checker": "5.1.2",
"license-checker": "^16.0.0",
"load-grunt-config": "0.19.2",
"makelogs": "^4.0.3",
"marked-text-renderer": "0.1.0",

6
tasks/config/licenses.js
View file

@ -40,6 +40,12 @@ module.exports = function () {
'WTFPL',
],
overrides: {
// TODO can be removed once we upgrade past elasticsearch-browser@14.0.0
'elasticsearch-browser@13.0.1': ['Apache-2.0'],
// TODO can be removed once we upgrade past colors.js@1.0.0
'colors@0.5.1': ['MIT'],
// TODO can be removed once we upgrade past map-stream@0.5.0
'map-stream@0.1.0': ['MIT'],
'uglify-js@2.2.5': ['BSD'],
}
}

6
tasks/lib/packages/license_checker.js
View file

@ -16,9 +16,11 @@ export function callLicenseChecker(options = {}) {
production: !dev,
json: true,
customFormat: {
realPath: true
realPath: true,
licenseText: false,
licenseFile: false
}
}, (licenseInfo, err) => {
}, (err, licenseInfo) => {
if (err) reject(err);
else resolve(licenseInfo);
});

65
yarn.lock
View file

@ -6943,15 +6943,19 @@ libesvm@^3.9.0:
through2 "~0.6.3"
uuid "^3.1.0"
license-checker@5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/license-checker/-/license-checker-5.1.2.tgz#107b0221174790c1fe199587cb6d8fa15564c9bb"
license-checker@^16.0.0:
version "16.0.0"
resolved "https://registry.yarnpkg.com/license-checker/-/license-checker-16.0.0.tgz#4e1263e5314b4519f8c3a5fe2fe4f38bc645a87d"
dependencies:
chalk "~0.5.1"
debug "^2.2.0"
mkdirp "^0.3.5"
nopt "^2.2.0"
read-installed "~4.0.3"
semver "^5.3.0"
spdx "^0.5.1"
spdx-correct "^2.0.3"
spdx-satisfies "^0.1.3"
treeify "^1.0.1"
linkify-it@^2.0.0:
@ -10634,20 +10638,71 @@ spawn-sync@^1.0.15:
concat-stream "^1.4.7"
os-shim "^0.1.2"
spdx-compare@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/spdx-compare/-/spdx-compare-0.1.2.tgz#b06af3ea34af7437d91a9f449eaf2d2e93c3c8fb"
dependencies:
spdx-expression-parse "^1.0.0"
spdx-ranges "^1.0.0"
spdx-correct@^2.0.3:
version "2.0.4"
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-2.0.4.tgz#d1652ad2ebc516f656f66ea93398558065f1b4a4"
dependencies:
spdx-expression-parse "^2.0.1"
spdx-license-ids "^2.0.1"
spdx-correct@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
dependencies:
spdx-license-ids "^1.0.2"
spdx-expression-parse@~1.0.0:
spdx-exceptions@^1.0.0:
version "1.0.5"
resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-1.0.5.tgz#9d21ac4da4bdb71d060fb74e5a67531d032cbba6"
spdx-exceptions@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
spdx-expression-parse@^1.0.0, spdx-expression-parse@~1.0.0:
version "1.0.4"
resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
spdx-license-ids@^1.0.2:
spdx-expression-parse@^2.0.1:
version "2.0.2"
resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-2.0.2.tgz#e2e0f229c057eac704c5a6d1c687eed66aca034b"
dependencies:
spdx-exceptions "^2.0.0"
spdx-license-ids "^2.0.1"
spdx-license-ids@^1.0.0, spdx-license-ids@^1.0.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
spdx-license-ids@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-2.0.1.tgz#02017bcc3534ee4ffef6d58d20e7d3e9a1c3c8ec"
spdx-ranges@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/spdx-ranges/-/spdx-ranges-1.0.1.tgz#0f4eec7b8ea48ed202e374bb8942e8d18dc0113e"
spdx-satisfies@^0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/spdx-satisfies/-/spdx-satisfies-0.1.3.tgz#67a1f274e6115d4aae28afe474db76164be10bdc"
dependencies:
spdx-compare "^0.1.2"
spdx-expression-parse "^1.0.0"
spdx@^0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/spdx/-/spdx-0.5.1.tgz#d36c275088b48d75a9046cd44a838ce4b5339998"
dependencies:
spdx-exceptions "^1.0.0"
spdx-license-ids "^1.0.0"
spdy-transport@^2.0.18:
version "2.0.20"
resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.0.20.tgz#735e72054c486b2354fe89e702256004a39ace4d"