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 f13a1a206212525a570cdbc51d4cdd98bf180053 Author: Chris Lemmons <alfic...@gmail.com> AuthorDate: Mon Aug 14 17:05:16 2017 -0600 Update LICENSE and a few headers to fix weasel complaints. --- .dependency_license | 3 +- LICENSE | 72 ++++++++++++++-------- traffic_ops/app/lib/Schema/Result/ApiCapability.pm | 15 +++++ traffic_ops/app/lib/Schema/Result/Capability.pm | 15 +++++ .../app/lib/Schema/Result/ProfileTypeValue.pm | 15 +++++ .../app/lib/Schema/Result/RoleCapability.pm | 15 +++++ traffic_ops/app/lib/Schema/Result/Tenant.pm | 15 +++++ traffic_ops/app/lib/Schema/Result/UserRole.pm | 15 +++++ 8 files changed, 140 insertions(+), 25 deletions(-) diff --git a/.dependency_license b/.dependency_license index 8857642..585a3f8 100644 --- a/.dependency_license +++ b/.dependency_license @@ -36,7 +36,7 @@ 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/src/main/webapp/.*\.(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 ^traffic_ops/goto/testFiles/, Apache @@ -74,6 +74,7 @@ datatables\.min, MIT GeoLite2-City.mmdb.gz, CC-A-SA jquery\.tree\.min\.css$, MIT jquery\.dataTables\.min\.(css|js)$, MIT +^traffic_ops/traffic_ops_golang/vendor/github.com/basho/backoff/.*, MIT # Ignored - Do not report. \.DS_Store, Ignore # Created automatically OSX. diff --git a/LICENSE b/LICENSE index 974b03e..2cce8d3 100644 --- a/LICENSE +++ b/LICENSE @@ -228,7 +228,7 @@ For the modernizr component: For the fontawesome component: @docs/source/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf @docs/source/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.* -@traffic_ops/experimental/ui/app/src/assets/fonts/[Ff]ont[Aa]wesome* +@traffic_portal/app/src/assets/fonts/[Ff]ont[Aa]wesome* These binary fontawesome fonts are provided under the SIL Open Font License 1.1: ./licenses/SIL-1.1 @@ -256,7 +256,7 @@ For the bootstrap component: ./licenses/MIT-normalize For the sorttable component: -@traffic_monitor_golang/traffic_monitor/static/sorttable.js +@traffic_monitor/static/sorttable.js ./licenses/MIT-sorttable For the jQuery component: @@ -273,9 +273,9 @@ For the jMenu component: For the DataTables component: @traffic_ops/app/public/js/jquery.dataTables.js -@traffic_ops/experimental/ui/app/src/assets/css/jquery.dataTables.min.css -@traffic_ops/experimental/ui/app/src/assets/js/dataTables.tableTools.js -@traffic_ops/experimental/ui/app/src/assets/js/jquery.dataTables.min.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 ./licenses/MIT-datatables For the jquery.tree component: @@ -283,37 +283,33 @@ For the jquery.tree component: ./licenses/MIT-jquery_tree For the ng-map component: -@traffic_ops/experimental/ui/app/src/assets/js/ng-map_1.17.6.min.js +@traffic_portal/app/src/assets/js/ng-map_1.17.6.min.js ./licenses/MIT-ng_map For the angular-loading-bar component: -@traffic_ops/experimental/ui/app/src/styles/loading.scss @traffic_portal/app/src/styles/loading.scss +@traffic_portal/v1/app/src/styles/loading.scss ./licenses/MIT-angular_loading_bar For the gentelella admin theme: -@traffic_ops/experimental/ui/app/src/styles/theme.scss +@traffic_portal/app/src/styles/theme.scss ./licenses/MIT-gentelella For the underscore component: -@traffic_ops/experimental/ui/app/src/assets/js/underscore-min_1.8.3.js +@traffic_portal/app/src/assets/js/underscore-min_1.8.3.js ./licenses/MIT-underscore For the selenium component: @infrastructure/test/ui/vendor/github.com/tebeka/selenium/* ./infrastructure/test/ui/vendor/github.com/tebeka/selenium/LICENSE.txt -For the gmx component: -@traffic_monitor_golang/vendor/github.com/davecheney/gmx/* -./traffic_monitor_golang/vendor/github.com/davecheney/gmx/LICENCE - For the stoppableListener component: -@traffic_monitor_golang/vendor/github.com/hydrogen18/stoppableListener/* -./traffic_monitor_golang/vendor/github.com/hydrogen18/stoppableListener/LICENSE +@traffic_monitor/vendor/github.com/hydrogen18/stoppableListener/* +./traffic_monitor/vendor/github.com/hydrogen18/stoppableListener/LICENSE For the fsnotify component: -@traffic_monitor_golang/vendor/gopkg.in/fsnotify.v1/* -./traffic_monitor_golang/vendor/gopkg.in/fsnotify.v1/LICENSE +@traffic_monitor/vendor/gopkg.in/fsnotify.v1/* +./traffic_monitor/vendor/gopkg.in/fsnotify.v1/LICENSE For the jwt-go component: @traffic_ops/experimental/traffic_ops_auth/vendor/github.com/dgrijalva/jwt-go/* @@ -323,6 +319,10 @@ For the pq component: @traffic_ops/experimental/traffic_ops_auth/vendor/github.com/lib/pq/* ./traffic_ops/experimental/traffic_ops_auth/vendor/github.com/lib/pq/LICENSE.md +and also: +@traffic_ops/traffic_ops_golang/vendor/github.com/lib/pq/* +./traffic_ops/traffic_ops_golang/vendor/github.com/lib/pq/LICENSE.md + For the influxdb component: @traffic_stats/vendor/github.com/influxdata/influxdb/* ./traffic_stats/vendor/github.com/influxdata/influxdb/LICENSE @@ -336,10 +336,6 @@ For the x/net component: @traffic_stats/vendor/golang.org/x/net/* ./traffic_stats/vendor/golang.org/x/net/LICENSE -For the errgo component: -@traffic_stats/vendor/gopkg.in/errgo.v1/* -./traffic_stats/vendor/gopkg.in/errgo.v1/LICENSE - For the MaxMind DB GeoLite2 Database: @traffic_router/core/src/test/resources/geo/GeoLite2-City.mmdb.gz ./licenses/CC_A_SA_4-maxmind @@ -363,7 +359,7 @@ For the IPv6 Perl Module component: ./licenses/ISC-netpacket_ipv6 Several subsections of main.css are under the MIT license, as noted in the file: -@traffic_ops/experimental/ui/app/src/styles/main.scss +@traffic_portal/app/src/styles/main.scss @traffic_portal/app/src/styles/main.scss For the bootstrap-vertical-tabs component: @@ -384,5 +380,33 @@ The invalid_passwords.txt file is from the Projects/OWASP SecLists Project provi ./licenses/MIT-SecLists For the go-sqlmock component: -@traffic_ops/traffic_ops_golang/vendor/gopkg.in/DATA-DOG/go-sqlmock/* -./traffic_ops/traffic_ops_golang/vendor/gopkg.in/DATA-DOG/go-sqlmock/LICENSE +@traffic_ops/traffic_ops_golang/vendor/gopkg.in/DATA-DOG/go-sqlmock.v1/* +./traffic_ops/traffic_ops_golang/vendor/gopkg.in/DATA-DOG/go-sqlmock.v1/LICENSE + +For the go-jwx component: +@traffic_ops/traffic_ops_golang/vendor/github.com/lestrrat/go-jwx/* +./traffic_ops/traffic_ops_golang/vendor/github.com/lestrrat/go-jwx/LICENSE + +For the protobuf component: +@traffic_ops/traffic_ops_golang/vendor/github.com/golang/protobuf/* +./traffic_ops/traffic_ops_golang/vendor/github.com/golang/protobuf/LICENSE + +For the sqlx component: +@traffic_ops/traffic_ops_golang/vendor/github.com/jmoiron/sqlx/* +./traffic_ops/traffic_ops_golang/vendor/github.com/jmoiron/sqlx/LICENSE + +For the backoff component: +@traffic_ops/traffic_ops_golang/vendor/github.com/basho/backoff/* +./traffic_ops/traffic_ops_golang/vendor/github.com/basho/backoff/README.md + +The riak-go-client component is used under the Apache license: +@traffic_ops/traffic_ops_golang/vendor/github.com/basho/riak-go-client/* +./traffic_ops/traffic_ops_golang/vendor/github.com/basho/riak-go-client/LICENSE + +The x/crypto library is used under the BSD License from the Go Authors: +@traffic_ops/traffic_ops_golang/vendor/golang.org/x/crypto/* +./traffic_ops/traffic_ops_golang/vendor/golang.org/x/crypto/LICENSE + +The envconfig component is used under the MIT license: +@traffic_ops/testing/api/vendor/github.com/kelseyhightower/envconfig/* +./traffic_ops/testing/api/vendor/github.com/kelseyhightower/envconfig/LICENSE diff --git a/traffic_ops/app/lib/Schema/Result/ApiCapability.pm b/traffic_ops/app/lib/Schema/Result/ApiCapability.pm index f5ec12b..cffe081 100644 --- a/traffic_ops/app/lib/Schema/Result/ApiCapability.pm +++ b/traffic_ops/app/lib/Schema/Result/ApiCapability.pm @@ -142,4 +142,19 @@ __PACKAGE__->belongs_to( # You can replace this text with custom code or comments, and it will be preserved on regeneration +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# 1; diff --git a/traffic_ops/app/lib/Schema/Result/Capability.pm b/traffic_ops/app/lib/Schema/Result/Capability.pm index d636726..f877ee7 100644 --- a/traffic_ops/app/lib/Schema/Result/Capability.pm +++ b/traffic_ops/app/lib/Schema/Result/Capability.pm @@ -106,4 +106,19 @@ __PACKAGE__->has_many( # You can replace this text with custom code or comments, and it will be preserved on regeneration +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# 1; diff --git a/traffic_ops/app/lib/Schema/Result/ProfileTypeValue.pm b/traffic_ops/app/lib/Schema/Result/ProfileTypeValue.pm index 0d1b50d..8ab648c 100644 --- a/traffic_ops/app/lib/Schema/Result/ProfileTypeValue.pm +++ b/traffic_ops/app/lib/Schema/Result/ProfileTypeValue.pm @@ -66,4 +66,19 @@ __PACKAGE__->add_columns( # You can replace this text with custom code or comments, and it will be preserved on regeneration +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# 1; diff --git a/traffic_ops/app/lib/Schema/Result/RoleCapability.pm b/traffic_ops/app/lib/Schema/Result/RoleCapability.pm index 6154ebd..5fef770 100644 --- a/traffic_ops/app/lib/Schema/Result/RoleCapability.pm +++ b/traffic_ops/app/lib/Schema/Result/RoleCapability.pm @@ -96,4 +96,19 @@ __PACKAGE__->belongs_to( # You can replace this text with custom code or comments, and it will be preserved on regeneration +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# 1; diff --git a/traffic_ops/app/lib/Schema/Result/Tenant.pm b/traffic_ops/app/lib/Schema/Result/Tenant.pm index 3dadffe..646e2c9 100644 --- a/traffic_ops/app/lib/Schema/Result/Tenant.pm +++ b/traffic_ops/app/lib/Schema/Result/Tenant.pm @@ -183,4 +183,19 @@ __PACKAGE__->has_many( # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7I7o08tTBHjshtXVypmOUw # You can replace this text with custom code or comments, and it will be preserved on regeneration +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# 1; diff --git a/traffic_ops/app/lib/Schema/Result/UserRole.pm b/traffic_ops/app/lib/Schema/Result/UserRole.pm index 38a694e..d2b1a6c 100644 --- a/traffic_ops/app/lib/Schema/Result/UserRole.pm +++ b/traffic_ops/app/lib/Schema/Result/UserRole.pm @@ -96,4 +96,19 @@ __PACKAGE__->belongs_to( # You can replace this text with custom code or comments, and it will be preserved on regeneration +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# 1; -- To stop receiving notification emails like this one, please contact r...@apache.org.