This is an automated email from the ASF dual-hosted git repository.
rob pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit 6a97bec9b6c5e484cc117d7d1505066eddcc414d
Author: Chris Lemmons <alfic...@gmail.com>
AuthorDate: Tue Jan 30 17:02:33 2018 -0700
Updated dependency license file to not include images indiscriminately.
---
.dependency_license | 34 ++++++++++++++++++++++++++++++----
LICENSE | 3 ++-
2 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/.dependency_license b/.dependency_license
index 1dee1fb..17d2a37 100644
--- a/.dependency_license
+++ b/.dependency_license
@@ -36,14 +36,39 @@ RobotoSlab-Regular\.ttf$, Apache
traffic_monitor_config\.js$, Apache # Actually JSON with a specific format.
CrStates$, Apache # JSON with a specific format.
^docs/.*\.(png|jpe?g|ico|gif)$, Apache
-^traffic_ops/app/public/.*\.(png|jpe?g|ico|gif)$, Apache
-^traffic_monitor_java/src/main/webapp/.*\.(png|jpe?g|ico|gif)$, Apache
-/images/.*\.(png|jpe?g|ico|gif)$, Apache
-favicon.ico$, Apache
+favicon.(ico|png)$, Apache
^traffic_ops/experimental/goto/testFiles/, Apache
cron\.d/[^/]*$, Apache
\.pem$, Apache # Single certificate file.
+# Images, created for this project or used under an Apache license.
+^misc/traffic-control-cdn/images/atc_logo\.png, Apache
+^misc/traffic-control-cdn/images/header_bkgd\.png, Apache
+^misc/traffic-control-cdn/images/main_bkgd\.png, Apache
+^misc/traffic-control-cdn/images/tc_logo\.png, Apache
+^misc/traffic-control-cdn/images/traffic_monitor_logo\.png, Apache
+^misc/traffic-control-cdn/images/traffic_operations_logo\.png, Apache
+^misc/traffic-control-cdn/images/traffic_portal_logo\.png, Apache
+^misc/traffic-control-cdn/images/traffic_router_logo\.png, Apache
+^misc/traffic-control-cdn/images/traffic_stats_logo\.png, Apache
+^traffic_monitor_java/src/main/webapp/tune(-grey)?\.png, Apache
+^traffic_ops/app/public/images/anchor\.gif, Apache
+^traffic_ops/app/public/images/bad\.png, Apache
+^traffic_ops/app/public/images/blank\.png, Apache
+^traffic_ops/app/public/images/clock-black., Apache
+^traffic_ops/app/public/images/clock\.png, Apache
+^traffic_ops/app/public/images/good\.png, Apache
+^traffic_ops/app/public/images/graph\.png, Apache
+^traffic_ops/app/public/images/info\.png, Apache
+^traffic_ops/app/public/images/input_field_background\.png, Apache
+^traffic_ops/app/public/images/na\.png, Apache
+^traffic_ops/app/public/images/notrun\.png, Apache
+^traffic_ops/app/public/images/tc_logo\.png, Apache
+^traffic_ops/app/public/images/tc_logo_c_only\.png, Apache
+^traffic_ops/app/public/images/traffic_operations_logo\.png, Apache
+^traffic_ops/app/public/images/warning\.png, Apache
+^traffic_ops/app/public/images/select2.*, Apache
+
# Demo certificates
ssl\.(crt|key)$, Apache
/keystore, Apache
@@ -59,6 +84,7 @@ Inconsolata-Bold\.ttf$, SIL OFL 1.1
Lato-Bold\.ttf$, SIL OFL 1.1
Lato-Regular\.ttf$, SIL OFL 1.1
ssl-bundle\.crt$, MPL
+^traffic_portal/app/src/assets/images/sort_, MIT
# Code dependencies
#
diff --git a/LICENSE b/LICENSE
index eb9d1d5..7786915 100644
--- a/LICENSE
+++ b/LICENSE
@@ -276,6 +276,7 @@ For the DataTables component:
@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/images/sort_*
./licenses/MIT-datatables
For the jquery.tree component:
@@ -346,7 +347,7 @@ For the gofmt github hook:
./licenses/BSD-go
For the Select2 component:
-@traffic_ops/app/public/*/select2.*
+@traffic_ops/app/public/*/select2*
This dual-licensed component is herein licensed under the Apache 2.0 license.
Copyright (c) 2012-2015 Kevin Brown, Igor Vaynberg, and Select2 contributors
--
To stop receiving notification emails like this one, please contact
r...@apache.org.
