You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2011/10/28 19:04:58 UTC
svn commit: r1190451 - in /tika/trunk:
tika-app/src/main/appended-resources/META-INF/LICENSE
tika-bundle/src/main/appended-resources/META-INF/LICENSE
Author: jukka
Date: Fri Oct 28 17:04:58 2011
New Revision: 1190451
URL: http://svn.apache.org/viewvc?rev=1190451&view=rev
Log:
TIKA-763: Update license metadata
Add NetCDF
Modified:
tika/trunk/tika-app/src/main/appended-resources/META-INF/LICENSE
tika/trunk/tika-bundle/src/main/appended-resources/META-INF/LICENSE
Modified: tika/trunk/tika-app/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/tika/trunk/tika-app/src/main/appended-resources/META-INF/LICENSE?rev=1190451&r1=1190450&r2=1190451&view=diff
==============================================================================
--- tika/trunk/tika-app/src/main/appended-resources/META-INF/LICENSE (original)
+++ tika/trunk/tika-app/src/main/appended-resources/META-INF/LICENSE Fri Oct 28 17:04:58 2011
@@ -302,3 +302,36 @@ SLF4J library (slf4j-api, slf4j-log4j12)
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.
+
+NetCDF library (netcdf)
+
+ Copyright 1998-2009 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. 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/tika-bundle/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/tika/trunk/tika-bundle/src/main/appended-resources/META-INF/LICENSE?rev=1190451&r1=1190450&r2=1190451&view=diff
==============================================================================
--- tika/trunk/tika-bundle/src/main/appended-resources/META-INF/LICENSE (original)
+++ tika/trunk/tika-bundle/src/main/appended-resources/META-INF/LICENSE Fri Oct 28 17:04:58 2011
@@ -302,3 +302,36 @@ SLF4J library (slf4j-api, slf4j-log4j12)
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.
+
+NetCDF library (netcdf)
+
+ Copyright 1998-2009 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. 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.