From 029b2b37e5f58f6b363cfe68498b64695b9902fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Mon, 14 Dec 2020 08:21:17 +0100 Subject: [PATCH 1/2] doc: update and run license-builder for Babel --- LICENSE | 6 +++--- tools/license-builder.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index 5f905a79a96090..2d4040e537adad 100644 --- a/LICENSE +++ b/LICENSE @@ -1248,12 +1248,12 @@ The externally maintained libraries used by Node.js are: THE SOFTWARE. """ -- babel-eslint, located at tools/node_modules/babel-eslint, is licensed as follows: +- Babel, located at tools/node_modules/@babel, is licensed as follows: """ - Copyright (c) 2014-2016 Sebastian McKenzie - MIT License + Copyright (c) 2014-present Sebastian McKenzie and other contributors + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including diff --git a/tools/license-builder.sh b/tools/license-builder.sh index 899f9de99c0610..0f5fd6a155f704 100755 --- a/tools/license-builder.sh +++ b/tools/license-builder.sh @@ -83,7 +83,7 @@ addlicense "markupsafe" "tools/inspector_protocol/markupsafe" "$(cat "${rootdir} addlicense "cpplint.py" "tools/cpplint.py" \ "$(sed -e '/^$/,$d' -e 's/^#$//' -e 's/^# //' "${rootdir}"/tools/cpplint.py | tail -n +3)" addlicense "ESLint" "tools/node_modules/eslint" "$(cat "${rootdir}"/tools/node_modules/eslint/LICENSE)" -addlicense "babel-eslint" "tools/node_modules/babel-eslint" "$(cat "${rootdir}"/tools/node_modules/babel-eslint/LICENSE)" +addlicense "Babel" "tools/node_modules/@babel" "$(cat "${rootdir}"/tools/node_modules/@babel/core/LICENSE)" addlicense "gtest" "test/cctest/gtest" "$(cat "${rootdir}"/test/cctest/gtest/LICENSE)" # nghttp2 From 0a82ba4036b33137ceb82a49c64c50af9340ac81 Mon Sep 17 00:00:00 2001 From: Create or Update Pull Request Action Date: Mon, 21 Dec 2020 00:17:32 +0000 Subject: [PATCH 2/2] doc: run license-builder --- LICENSE | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/LICENSE b/LICENSE index 2d4040e537adad..e5cbda26eba272 100644 --- a/LICENSE +++ b/LICENSE @@ -1250,28 +1250,6 @@ The externally maintained libraries used by Node.js are: - Babel, located at tools/node_modules/@babel, is licensed as follows: """ - MIT License - - Copyright (c) 2014-present Sebastian McKenzie and other contributors - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ - gtest, located at test/cctest/gtest, is licensed as follows: