dangogh closed pull request #2179: license changes for jsdiff and momentjs URL: https://github.com/apache/incubator-trafficcontrol/pull/2179
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/.dependency_license b/.dependency_license index 1c09bdbc2..f4636cd89 100644 --- a/.dependency_license +++ b/.dependency_license @@ -113,7 +113,7 @@ bootstrap-theme\.css\.map, MIT datatables\.min, MIT GeoLite2-City.mmdb.gz, CC-A-SA jquery\.tree\.min\.css$, MIT -jquery\.dataTables\.min\.(css|js)$, MIT +jquery\.dataTables\..*\.(css|js)$, MIT ^traffic_ops/traffic_ops_golang/vendor/github.com/basho/backoff/.*, MIT # Ignored - Do not report. diff --git a/LICENSE b/LICENSE index a1b85dbb0..670463206 100644 --- a/LICENSE +++ b/LICENSE @@ -273,20 +273,23 @@ For the jMenu component: For the DataTables component: @traffic_ops/app/public/js/jquery.dataTables.js -@traffic_portal/app/src/assets/css/jquery.dataTables.min.css -@traffic_portal/app/src/assets/js/dataTables.tableTools.js -@traffic_portal/app/src/assets/js/jquery.dataTables.min.js +@traffic_portal/app/src/assets/css/jquery.dataTables.min_1.10.9.css +@traffic_portal/app/src/assets/js/jquery.dataTables.min_1.10.16.js @traffic_portal/app/src/assets/images/sort_* ./licenses/MIT-datatables +For the moment.js component: +@traffic_portal/app/src/assets/js/moment-min_2.22.1.js +./licenses/MIT-momentjs + +For the jsdiff component: +@traffic_portal/app/src/assets/js/jsdiff-min_3.5.0.js +./licenses/BSD-jsdiff + For the jquery.tree component: @traffic_ops/app/public/*/jquery.tree.min.* ./licenses/MIT-jquery_tree -For the ng-map component: -@traffic_portal/app/src/assets/js/ng-map_1.17.6.min.js -./licenses/MIT-ng_map - For the angular-loading-bar component: @traffic_portal/app/src/styles/loading.scss @traffic_portal/v1/app/src/styles/loading.scss diff --git a/licenses/MIT-ng_map b/licenses/MIT-ng_map deleted file mode 100644 index 4c5529f1b..000000000 --- a/licenses/MIT-ng_map +++ /dev/null @@ -1,28 +0,0 @@ -/** - * AngularJS Google Maps Ver. 1.17.3 - * - * The MIT License (MIT) - * - * Copyright (c) 2014, 2015, 1016 Allen Kim - */ - -The MIT License (MIT) - -Copyright (c) 2014, 2015, 2016 Allen Kim - -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. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
