knutsel closed pull request #2438: License compliance updates
URL: https://github.com/apache/trafficcontrol/pull/2438
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 bff7215e2..4a1312047 100644
--- a/.dependency_license
+++ b/.dependency_license
@@ -54,6 +54,7 @@ cron\.d/[^/]*$, Apache
^misc/logos/Traffic-Control-Logo-FINAL-Black-Text\.png, Apache
^misc/logos/Traffic-Control-Logo-FINAL-White-Text\.png, Apache
^misc/logos/Traffic-Control-Logo-FINALc\.png\.zip, Apache
+^misc/logos/atc-final\.svg, Apache
^misc/logos/atc-final\.psd, Apache
^misc/logos/atc-largepng-c-only\.png, Apache
^misc/logos/page_logos/trafficLogoFactory\.psd, Apache
diff --git a/.rat-excludes b/.rat-excludes
index e461914a8..4c270fd1b 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -26,7 +26,7 @@ keystore.*(?: keystore ){0}
README.*(?: Readme's don't usually require a separate
license. ){0}
CHANGELOG.*(?: Changelogs don't usually require a
separate license. ){0}
Result(?: traffic_ops/app/lib/Schema/Result
contains only generated code ){0}
-.*\.(?:png|gif|ico|jpe?g)?(?: Images don't bear their own license
information. ){0}
+.*\.(?:png|gif|ico|jpe?g|svg)?(?: Images don't bear their own license
information. ){0}
sphinx_rtd_theme(?: MIT. Properly documented in LICENSE ){0}
selenium(?: MIT. Properly documented in LICENSE ){0}
gmx(?: MIT. Properly documented in LICENSE ){0}
diff --git a/LICENSE b/LICENSE
index 76015096f..cf362519c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -213,21 +213,7 @@ For readability, subcomponent licenses have been broken
out into their own
files, largely located in the licenses directory. Each subcomponent enumerated
below lists the files it comprises and a link to the full text of the license.
-For the sphinx_rtd_theme component:
-@docs/source/_themes/sphinx_rtd_theme/*
-./licenses/MIT-sphinx_rtd_theme
-
-For the sphinx_rtd_theme/search.html component:
-@docs/source/_themes/sphinx_rtd_theme/search.html
-./licenses/BSD-sphinx_rtd_theme_search
-
-For the modernizr component:
-@docs/source/_themes/sphinx_rtd_theme/static/js/modernizr.min.js
-./licenses/MIT-modernizr
-
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_portal/app/src/assets/fonts/[Ff]ont[Aa]wesome*
These binary fontawesome fonts are provided under the SIL Open Font License
1.1:
@@ -236,18 +222,6 @@ These binary fontawesome fonts are provided under the SIL
Open Font License 1.1:
The fontawesome CSS files are provided under an MIT license:
./licenses/MIT-fontawesome
-For the Inconsolata and Lato fonts:
-@docs/source/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf
-@docs/source/_themes/sphinx_rtd_theme/static/fonts/Inconsolata.ttf
-@docs/source/_themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf
-@docs/source/_themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf
-./licenses/SIL-1.1
-
-For the RobotoSlab fonts
-@docs/source/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf
-@docs/source/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf
-./licenses/AL2-RobotoSlab
-
For the bootstrap component:
@misc/traffic-control-cdn/*/bootstrap*
./licenses/MIT-bootstrap
diff --git a/traffic_ops/app/lib/Schema/Result/CachegroupFallback.pm
b/traffic_ops/app/lib/Schema/Result/CachegroupFallback.pm
index 58046b3a8..a4d1905e2 100644
--- a/traffic_ops/app/lib/Schema/Result/CachegroupFallback.pm
+++ b/traffic_ops/app/lib/Schema/Result/CachegroupFallback.pm
@@ -133,6 +133,20 @@ __PACKAGE__->belongs_to(
# Created by DBIx::Class::Schema::Loader v0.07048 @ 2018-03-20 04:15:32
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9bJ/JA5FNpy0LYu1KRdQqA
-
-# 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/Coordinate.pm
b/traffic_ops/app/lib/Schema/Result/Coordinate.pm
index 7463079fc..03b8bebcd 100644
--- a/traffic_ops/app/lib/Schema/Result/Coordinate.pm
+++ b/traffic_ops/app/lib/Schema/Result/Coordinate.pm
@@ -126,6 +126,20 @@ __PACKAGE__->has_many(
# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-05-15 16:06:00
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:FZ64Zkbh+B6CECd1k/h66w
-
-# 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/Origin.pm
b/traffic_ops/app/lib/Schema/Result/Origin.pm
index 6c0126eb3..d3fd5959a 100644
--- a/traffic_ops/app/lib/Schema/Result/Origin.pm
+++ b/traffic_ops/app/lib/Schema/Result/Origin.pm
@@ -280,6 +280,20 @@ __PACKAGE__->belongs_to(
# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-05-15 16:06:00
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EFdWsJg/ANV/vUHBHfK0iA
-
-# 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;
----------------------------------------------------------------
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
