-
Notifications
You must be signed in to change notification settings - Fork 916
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Update _sidebar.md Signed-off-by: Miki <[email protected]> * Update license checker config Signed-off-by: Miki <[email protected]> * Regenerate yarn.lock file Signed-off-by: Miki <[email protected]> * Add yarn.lock, license, and docs checks to the workflow Also: * Bumped actions in CI Signed-off-by: Miki <[email protected]> * Changeset file for PR #9064 created/updated --------- Signed-off-by: Miki <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
- Loading branch information
1 parent
791f5d8
commit 8eb87aa
Showing
5 changed files
with
83 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| infra: | ||
| - Add checks for out of sync lockfile and dev docc to the CI ([#9064](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/9064)) | ||
| - Validate the licensing imposed by dependencies during CI ([#9064](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/9064)) | ||
|
|
||
| chore: | ||
| - Bump actions used by build and test workflows ([#9064](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/9064)) | ||
|
|
||
| feat: | ||
| - Improve validation of the licensing imposed by dependencies. ([#9064](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/9064)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,29 +28,39 @@ | |
| * under the License. | ||
| */ | ||
|
|
||
| // ToDo: Make an allow-list for packages with licenses that require attribution so | ||
| // they can be allowed only after attribution is added but fail before. | ||
|
|
||
| // The following list applies to packages both | ||
| // used as dependencies or dev dependencies | ||
| export const LICENSE_ALLOWLIST = [ | ||
| 'Elastic-License', | ||
| '0BSD', | ||
| '(AFL-2.1 OR BSD-3-Clause)', | ||
| '(Apache-2.0 AND BSD-3-Clause)', | ||
| '(BSD-2-Clause OR MIT OR Apache-2.0)', | ||
| '(BSD-2-Clause OR MIT)', | ||
| '(BSD-3-Clause AND Apache-2.0)', | ||
| '(BSD-3-Clause OR GPL-2.0)', | ||
| '(GPL-2.0 OR MIT)', | ||
| '(MIT AND CC-BY-3.0)', | ||
| '(MIT AND Zlib)', | ||
| '(MIT OR Apache-2.0)', | ||
| '(MIT AND BSD-3-Clause)', | ||
| '(MIT OR CC0-1.0)', | ||
| '(MIT OR GPL-3.0)', | ||
| '(WTFPL OR MIT)', | ||
| '(MPL-2.0 OR Apache-2.0)', | ||
| '(OFL-1.1 AND MIT)', | ||
| '(Unlicense OR Apache-2.0)', | ||
| '(WTFPL OR MIT)', | ||
| '0BSD', | ||
| 'AFLv2.1', | ||
| 'Apache 2.0', | ||
| 'Apache License, v2.0', | ||
| 'Apache License, Version 2.0', | ||
| 'Apache License, v2.0', | ||
| 'Apache', | ||
| 'Apache*', | ||
| 'Apache, Version 2.0', | ||
| 'Apache-2.0', | ||
| 'BlueOak-1.0.0', | ||
| 'BSD 3-Clause', | ||
| 'BSD New', | ||
| 'BSD', | ||
|
|
@@ -59,29 +69,28 @@ export const LICENSE_ALLOWLIST = [ | |
| 'BSD-3-Clause AND MIT', | ||
| 'BSD-3-Clause OR MIT', | ||
| 'BSD-3-Clause', | ||
| '(BSD-3-Clause OR GPL-2.0)', | ||
| 'BSD-like', | ||
| 'CC0-1.0', | ||
| 'CC-BY', | ||
| 'CC-BY-3.0', | ||
| 'CC-BY-4.0', | ||
| 'CC0-1.0', | ||
| 'Eclipse Distribution License - v 1.0', | ||
| 'Elastic-License', | ||
| 'FreeBSD', | ||
| 'ISC', | ||
| 'ISC*', | ||
| 'MIT OR GPL-2.0', | ||
| '(MIT OR CC0-1.0)', | ||
| 'MIT', | ||
| 'MIT*', | ||
| 'MIT/X11', | ||
| 'new BSD, and MIT', | ||
| '(OFL-1.1 AND MIT)', | ||
| 'Nuclide software', | ||
| 'PSF', | ||
| 'Public Domain', | ||
| 'Python-2.0', | ||
| 'Unlicense', | ||
| 'WTFPL OR ISC', | ||
| 'WTFPL', | ||
| 'Nuclide software', | ||
| 'new BSD, and MIT', | ||
| ]; | ||
|
|
||
| // The following list only applies to licenses that | ||
|
|
@@ -90,12 +99,7 @@ export const DEV_ONLY_LICENSE_ALLOWLIST = ['MPL-2.0']; | |
|
|
||
| // Globally overrides a license for a given package@version | ||
| export const LICENSE_OVERRIDES = { | ||
| '[email protected]': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts | ||
| '@mapbox/[email protected]': ['MIT'], // license in readme https://github.com/tmcw/jsonlint | ||
|
|
||
| // TODO can be removed if the https://github.com/jindw/xmldom/issues/239 is released | ||
| '[email protected]': ['MIT'], | ||
|
|
||
| // TODO can be removed once we upgrade the use of walk dependency past or equal to v2.3.14 | ||
| '[email protected]': ['BlueOak-1.0.0'], | ||
| '[email protected]': ['BlueOak-1.0.0'], | ||
| '[email protected]': ['MIT'], | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters