Skip to content

Add license check #7112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rashidkpc merged 2 commits into from
May 4, 2016
+21 −3
Merged

Add license check #7112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
412b711
Add the license check back
May 2, 2016
fb8b2a4
Merge branch 'master' of github.com:elastic/kibana into fix/licenses
May 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion tasks/config/licenses.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,18 @@ module.exports = function (grunt) {
'MIT*',
'MIT License',
'MIT/X11',
'OFL-1.1 AND MIT',
'new BSD, and MIT',
'(MIT OR Apache-2.0)',
'BSD',
'BSD*',
'BSD New',
'BSD-like',
'BSD-2-Clause',
'(BSD-2-Clause OR MIT OR Apache-2.0)',
'BSD-3-Clause',
'CC-BY',
'CC-BY-4.0',
'Apache',
'Apache*',
'Apache v2',
Expand All @@ -29,25 +33,34 @@ module.exports = function (grunt) {
],
overrides: {
'[email protected]': ['BSD-3-Clause', 'MIT'],
'angular-bootstrap@0.10.0': ['MIT'],
'@spalger/angular-bootstrap@0.12.1': ['MIT'],
'[email protected]': ['MIT'],
'[email protected]': ['MIT'],
'[email protected]': ['MIT/X11'],
'[email protected]': ['UNLICENSE'],
'[email protected]': ['MIT'],
'[email protected]': ['MIT'],
'[email protected]': ['MIT'],
'[email protected]': ['MIT'],
'[email protected]': ['MIT'],
'[email protected]': ['Public-Domain'],
'[email protected]': ['MIT'],
'[email protected]': ['MIT'],
'[email protected]': ['MIT'],
'[email protected]': ['MIT'],
'[email protected]': ['ISC'],
'[email protected]': ['MIT'],
'[email protected]': ['MIT'],
'[email protected]': ['MIT'],
'[email protected]': ['BSD-2-Clause'],
'[email protected]': ['Public-Domain'],
'[email protected]': ['MIT'],
'[email protected]': ['MIT'],
'[email protected]': ['MIT'],
'[email protected]': ['MIT'],
'[email protected]': ['MIT'],
'[email protected]': ['BSD'],
'[email protected]': ['Public-Domain'],
}
}
};
Expand Down
8 changes: 6 additions & 2 deletions tasks/licenses.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@ module.exports = function (grunt) {
var options = { start: process.cwd(), json: true };
var checkQueueLength = 2;

function getLicenses(info, dependency) {
if (config.overrides[dependency]) return config.overrides[dependency];
if (info && info.licenses) return _.flatten([info.licenses]);
}

function processPackage(info, dependency) {
var pkgInfo = {};
pkgInfo.name = dependency;
pkgInfo.licenses = config.overrides[dependency] || (info && info.licenses);
pkgInfo.licenses = _.isArray(pkgInfo.licenses) ? pkgInfo.licenses : [pkgInfo.licenses];
pkgInfo.licenses = getLicenses(info, dependency);
pkgInfo.valid = (function () {
if (_.intersection(pkgInfo.licenses, config.licenses).length > 0) {
return true;
Expand Down
1 change: 1 addition & 0 deletions tasks/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ module.exports = function (grunt) {

grunt.task.run(_.compact([
!grunt.option('quick') && 'eslint:source',
'licenses',
'test:quick'
]));
});
Expand Down