You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2010/05/21 21:53:14 UTC
svn commit: r947145 - in /tika/trunk: LICENSE.txt NOTICE.txt
Author: mattmann
Date: Fri May 21 19:53:14 2010
New Revision: 947145
URL: http://svn.apache.org/viewvc?rev=947145&view=rev
Log:
- fix for TIKA-432 Include NOTICE and LICENSE file updates for NCAR NetCDF parser lib
Modified:
tika/trunk/LICENSE.txt
tika/trunk/NOTICE.txt
Modified: tika/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/tika/trunk/LICENSE.txt?rev=947145&r1=947144&r2=947145&view=diff
==============================================================================
--- tika/trunk/LICENSE.txt (original)
+++ tika/trunk/LICENSE.txt Fri May 21 19:53:14 2010
@@ -271,3 +271,32 @@ Charset detection code from ICU4J (http:
not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization of the
copyright holder.
+
+
+Parsing functionality provided by the NetCDF Java Library (http://www.unidata.ucar.edu/software/netcdf-java/)
+
+ Copyright 1993-2010 University Corporation for Atmospheric Research/Unidata
+
+ Portions of this software were developed by the Unidata Program at the University
+ Corporation for Atmospheric Research.
+
+ Access and use of this software shall impose the following obligations and understandings
+ on the user. The user is granted the right, without any fee or cost, to use, copy, modify,
+ alter, enhance and distribute this software, and any derivative works thereof, and its
+ supporting documentation for any purpose whatsoever, provided that this entire notice
+ appears in all copies of the software, derivative works and supporting documentation. Further,
+ UCAR requests that the user credit UCAR/Unidata in any publications that result from the use
+ of this software or in any product that includes this software, although this is not an obligation.
+ The names UCAR and/or Unidata, however, may not be used in any advertising or publicity to endorse
+ or promote any products or commercial entity unless specific written permission is obtained from
+ UCAR/Unidata. The user also understands that UCAR/Unidata is not obligated to provide the user with
+ any support, consulting, training or assistance of any kind with regard to the use, operation and
+ performance of this software nor to provide the user with any updates, revisions, new versions or
+ "bug fixes."
+
+ THIS SOFTWARE IS PROVIDED BY UCAR/UNIDATA "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL UCAR/UNIDATA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE ACCESS,
+ USE OR PERFORMANCE OF THIS SOFTWARE.
Modified: tika/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/tika/trunk/NOTICE.txt?rev=947145&r1=947144&r2=947145&view=diff
==============================================================================
--- tika/trunk/NOTICE.txt (original)
+++ tika/trunk/NOTICE.txt Fri May 21 19:53:14 2010
@@ -3,3 +3,7 @@ Copyright 2009 The Apache Software Found
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
+Copyright 1993-2010 University Corporation for Atmospheric Research/Unidata
+This software contains code derived from UCAR/Unidata's NetCDF library.
+