github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix jsonify license check (#12615) (#12619)

Browse source 
- Alphabetize order of licenses and overrides.
- Fix jsonify override so that the license passes.
This commit is contained in:
CJ Cenizal 2017-06-30 12:06:26 -07:00 • committed by GitHub
parent fa8cddd753
commit 90834a5d5f
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tasks/config/licenses.js
View file

@ -7,19 +7,19 @@ module.exports = function () {
'(MIT AND CC-BY-3.0)',
'(MIT OR Apache-2.0)',
'AFLv2.1',
'Apache',
'Apache 2.0',
'Apache License, v2.0',
'Apache',
'Apache*',
'Apache, Version 2.0',
'Apache-2.0',
'BSD',
'BSD New',
'BSD',
'BSD*',
'BSD-2-Clause',
'BSD-3-Clause',
'BSD-3-Clause AND MIT',
'BSD-3-Clause OR MIT',
'BSD-3-Clause',
'BSD-like',
'CC-BY',
'CC-BY-4.0',
@ -27,12 +27,12 @@ module.exports = function () {
'MIT',
'MIT*',
'MIT/X11',
'new BSD, and MIT',
'OFL-1.1 AND MIT',
'Public domain',
'Unlicense',
'WTFPL',
'WTFPL OR ISC',
'new BSD, and MIT'
'WTFPL',
],
overrides: {
'assert-plus@0.1.5': ['MIT'],
@ -47,10 +47,11 @@ module.exports = function () {
'delegate@3.0.1': ['MIT'],
'flatten@0.0.1': ['MIT'],
'indexof@0.0.1': ['MIT'],
'jsonify@0.0.0': ['Public domain'],
'ripemd160@0.2.0': ['MIT'],
'select@1.0.6': ['MIT'],
'ua-parser-js@0.7.13': ['MIT'],
'uglify-js@2.2.5': ['BSD'],
'ua-parser-js@0.7.13': ['MIT']
}
}
};

2
tasks/lib/licenses/valid.js
View file

@ -42,6 +42,6 @@ export function assertLicensesValid(options = {}) {
.map(describeInvalidLicenses(getInvalid));
if (invalidMsgs.length) {
throw new Error(`Non-confirming licenses: ${invalidMsgs.join('')}`);
throw new Error(`Non-conforming licenses: ${invalidMsgs.join('')}`);
}
}