From 0e857b7324d7a51ef8a868f08cf6abf8a16fe2ed Mon Sep 17 00:00:00 2001 From: Erik Hatcher Date: Sat, 15 Mar 2008 20:55:35 +0000 Subject: [PATCH] Added license information about the SOLR-494 added JQuery library git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@637468 13f79535-47bb-0310-9956-ffa450edef68 --- LICENSE.txt | 24 ++++++++++++++++++++++++ NOTICE.txt | 3 +++ 2 files changed, 27 insertions(+) diff --git a/LICENSE.txt b/LICENSE.txt index 5cc57cb766c..41514e99764 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -557,3 +557,27 @@ 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. +========================================================================== +The following license applies to the JQuery JavaScript library +-------------------------------------------------------------------------- +Copyright (c) 2008 John Resig, http://jquery.com/ + +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. + diff --git a/NOTICE.txt b/NOTICE.txt index 7fb57518616..2e89ec54c19 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -22,6 +22,9 @@ Copyright 2002. This product includes tests written with EasyMock Copyright 2001-2007 Tammo Freese (http://www.easymock.org/) +This product includes the JQuery JavaScript library created by John Resig. +Copyright (c) 2008 John Resig, http://jquery.com/ + ==============================================================