From 574dc9f999c482049775376993b0489101683926 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Wed, 30 May 2007 05:38:53 +0000 Subject: [PATCH] Adding newlines to easymock.jar MIT LICENSE.txt Updating Jetty license to be consistent with 6.1.3 git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@542755 13f79535-47bb-0310-9956-ffa450edef68 --- LICENSE.txt | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 9385b04d196..a94c3a39bb3 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -251,12 +251,9 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ========================================================================== -Portions of Jetty 5.1 are bundled in the Solr example server. -The following licenses are part of the Jetty 5.1 distribution, which -as a whole is licensed under The Apache License version 2.0. - - example/etc/LICENSE.javax.servlet.txt - - example/etc/LICENSE.javax.xml.html - - example/etc/LICENSE.jsse.txt +Portions of Jetty 6.1.3 are bundled in the Solr example server. +Jetty 6.1.3 is licensed under The Apache License version 2.0. + ========================================================================== The following license applies to parts of the lucene-snowball jar @@ -298,9 +295,21 @@ The following license applies to easymock.jar EasyMock 2 License (MIT License) Copyright (c) 2001-2007 OFFIS, Tammo Freese. -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: +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 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. +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.