svn commit: r1556660 - /manifoldcf/branches/CONNECTORS-840/lib-license/LICENSE.txt

[kw...@apache.org]

Author: kwright
Date: Wed Jan  8 22:14:24 2014
New Revision: 1556660

URL: http://svn.apache.org/r1556660
Log:
Update license to include mockito-all jar license

Modified:
    manifoldcf/branches/CONNECTORS-840/lib-license/LICENSE.txt

Modified: manifoldcf/branches/CONNECTORS-840/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-840/lib-license/LICENSE.txt?rev=1556660&r1=1556659&r2=1556660&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-840/lib-license/LICENSE.txt (original)
+++ manifoldcf/branches/CONNECTORS-840/lib-license/LICENSE.txt Wed Jan  8 22:14:24 2014
@@ -323,10 +323,29 @@ License: Apache 2 (http://www.apache.org
 This product includes a guava.jar.
 License: Apache 2  (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
+This product includes a mockito-all.jar.
+License: MIT (http://code.google.com/p/mockito/wiki/License)
+
 This product may include pdf files that embed IPA-licensed fonts.
 License: IPA Font License Agreement v1.0 (http://ossipedia.ipa.go.jp/ipafont/index.html#LicenseEng)
 
 ==========================================================================
+The following license applies to mockito-all.jar:
+--------------------------------------------------------------------------
+
+
+The MIT License
+
+Copyright (c) 2007 Mockito contributors
+
+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.
+
+
+==========================================================================
 The following license applies to json.jar, which is generated from the json
 sources from http://www.json.org/java/index.html
 --------------------------------------------------------------------------