From da0d477d410b9ef4d241e619d65b37aaac1f1bf4 Mon Sep 17 00:00:00 2001 From: Luciano Resende Date: Thu, 3 Dec 2015 11:16:25 -0800 Subject: [PATCH] Update LICENSE and NOTICE files Remove copyright information from NOTICE file, in favor of having them as part of each dependency license entry in the LICENSE file. --- LICENSE | 96 +++++++++++++++++++++++++++++++++++-- NOTICE | 12 ++--- apache-website-template.iml | 9 ++++ 3 files changed, 104 insertions(+), 13 deletions(-) create mode 100644 apache-website-template.iml diff --git a/LICENSE b/LICENSE index 7736772..817f2e9 100644 --- a/LICENSE +++ b/LICENSE @@ -205,11 +205,11 @@ The following components included on this website are distributed under MIT license : - Jekyll -- Jekyll Bootstrap -- Bootstrap -- jQuery -The MIT License (MIT): + +The MIT License (MIT) + +Copyright (c) 2008-2015 Tom Preston-Werner Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -230,3 +230,91 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +------------------ + +- Jekyll Bootstrap + +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. + +------------------ + +- Bootstrap + +The MIT License (MIT) + +Copyright (c) 2011-2015 Twitter, Inc + +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. + +------------------ + +- jQuery + +Copyright jQuery Foundation and other contributors, https://jquery.org/ + +This software consists of voluntary contributions made by many +individuals. For exact contribution history, see the revision history +available at https://github.com/jquery/jquery + +The following license applies to all parts of this software except as +documented below: + +==== + +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. + +==== + +All files located in the node_modules and external directories are +externally maintained libraries used by this software which have their +own licenses; we recommend you read them, as their terms may differ from +the terms above. \ No newline at end of file diff --git a/NOTICE b/NOTICE index a4fed15..5ddd773 100644 --- a/NOTICE +++ b/NOTICE @@ -1,11 +1,5 @@ +Apache Website Template +Copyright [2015] The Apache Software Foundation + This product includes software developed at The Apache Software Foundation (http://www.apache.org/). - -This product uses Jekyll software (http://jekyllrb.com/) -Copyright (c) 2008-2015 Tom Preston-Werner - -This product includes Boostrap software (http://getbootstrap.com/) -Copyright (c) 2011-2015 Twitter, Inc - -This product includes jQuery software (http://jquery.com/) -Copyright jQuery Foundation and other contributors, https://jquery.org/ diff --git a/apache-website-template.iml b/apache-website-template.iml new file mode 100644 index 0000000..8021953 --- /dev/null +++ b/apache-website-template.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file