TEZ-2365. Update tez-ui war's license/notice to reflect OFL license correctly. (hitesh)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/3c150cdc Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/3c150cdc Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/3c150cdc Branch: refs/heads/TEZ-2003 Commit: 3c150cdc1fb02b988c135728104388f503cd5b8b Parents: 47773a7 Author: Hitesh Shah <[email protected]> Authored: Mon Apr 27 11:33:40 2015 -0700 Committer: Hitesh Shah <[email protected]> Committed: Mon Apr 27 11:33:40 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + tez-ui/src/main/resources/META-INF/LICENSE.txt | 90 ++++++++++++++++++++- tez-ui/src/main/resources/META-INF/NOTICE.txt | 4 + 3 files changed, 94 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/3c150cdc/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index a8cdd79..b90f468 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -145,6 +145,7 @@ Release 0.6.1: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-2365. Update tez-ui war's license/notice to reflect OFL license correctly. TEZ-2329. UI Query on final dag status performance improvement TEZ-2287. Deprecate VertexManagerPluginContext.getTaskContainer(). TEZ-1909. Remove need to copy over all events from attempt 1 to attempt 2 dir http://git-wip-us.apache.org/repos/asf/tez/blob/3c150cdc/tez-ui/src/main/resources/META-INF/LICENSE.txt ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/resources/META-INF/LICENSE.txt b/tez-ui/src/main/resources/META-INF/LICENSE.txt index b7c8a86..dbeb161 100644 --- a/tez-ui/src/main/resources/META-INF/LICENSE.txt +++ b/tez-ui/src/main/resources/META-INF/LICENSE.txt @@ -291,6 +291,94 @@ POSSIBILITY OF SUCH DAMAGE. ----------------------------------------------------------------------- The Apache Tez tez-ui bundles the following fonts under the -SIL Open Font License (OFT) - http://scripts.sil.org/OFL +SIL Open Font License v1.1 (OFT) - http://scripts.sil.org/OFL - font-awesome fonts v4.2.0 (http://fontawesome.io/) - Created by Dave Gandy + +SIL OPEN FONT LICENSE + +Version 1.1 - 26 February 2007 + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting â in part or in whole â any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + http://git-wip-us.apache.org/repos/asf/tez/blob/3c150cdc/tez-ui/src/main/resources/META-INF/NOTICE.txt ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/resources/META-INF/NOTICE.txt b/tez-ui/src/main/resources/META-INF/NOTICE.txt index 88ff448..9a6feaf 100644 --- a/tez-ui/src/main/resources/META-INF/NOTICE.txt +++ b/tez-ui/src/main/resources/META-INF/NOTICE.txt @@ -4,3 +4,7 @@ Copyright (c) 2015 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). +This tez-ui bundle includes fonts protected under the Open Font License. +These fonts can only be distributed as part of a piece of software, but +not individually. See the license for details. http://scripts.sil.org/OFL. +More information on included fonts can be found in the LICENSE file.
