You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2018/04/27 02:42:36 UTC
[incubator-trafficcontrol] branch master updated: license changes
for jsdiff and momentjs
This is an automated email from the ASF dual-hosted git repository.
dangogh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 81a93e2 license changes for jsdiff and momentjs
81a93e2 is described below
commit 81a93e2d31e6d1b630396e42d98d4993f6e2b3c7
Author: Jeremy Mitchell <mi...@gmail.com>
AuthorDate: Thu Apr 26 16:33:25 2018 -0600
license changes for jsdiff and momentjs
---
.dependency_license | 2 +-
LICENSE | 17 ++++++++++-------
licenses/MIT-ng_map | 28 ----------------------------
3 files changed, 11 insertions(+), 36 deletions(-)
diff --git a/.dependency_license b/.dependency_license
index 1c09bdb..f4636cd 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 a1b85db..6704632 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 4c5529f..0000000
--- 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.
--
To stop receiving notification emails like this one, please contact
dangogh@apache.org.