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 2008/06/18 23:59:05 UTC
svn commit: r669307 - in /incubator/tika/trunk: CHANGES.txt LICENSE.txt
NOTICE.txt pom.xml
Author: jukka
Date: Wed Jun 18 14:59:04 2008
New Revision: 669307
URL: http://svn.apache.org/viewvc?rev=669307&view=rev
Log:
TIKA-144: Upgrade nekohtml dependency
- Upgraded to version 1.9.7
- This version is ALv2 and has no NOTICE file
Modified:
incubator/tika/trunk/CHANGES.txt
incubator/tika/trunk/LICENSE.txt
incubator/tika/trunk/NOTICE.txt
incubator/tika/trunk/pom.xml
Modified: incubator/tika/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/tika/trunk/CHANGES.txt?rev=669307&r1=669306&r2=669307&view=diff
==============================================================================
--- incubator/tika/trunk/CHANGES.txt (original)
+++ incubator/tika/trunk/CHANGES.txt Wed Jun 18 14:59:04 2008
@@ -53,6 +53,7 @@
22. TIKA-143 - Add ParsingReader (Jukka Zitting)
+23. TIKA-144 - Upgrade nekohtml dependency (Jukka Zitting)
Release 0.1-incubating - 12/27/2007
Modified: incubator/tika/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/tika/trunk/LICENSE.txt?rev=669307&r1=669306&r2=669307&view=diff
==============================================================================
--- incubator/tika/trunk/LICENSE.txt (original)
+++ incubator/tika/trunk/LICENSE.txt Wed Jun 18 14:59:04 2008
@@ -322,53 +322,3 @@
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.
-
-CyberNeko HTML Parser library (nekohtml)
-
- The CyberNeko Software License, Version 1.0
-
- (C) Copyright 2002-2005, Andy Clark. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- 3. The end-user documentation included with the redistribution,
- if any, must include the following acknowledgment:
- "This product includes software developed by Andy Clark."
- Alternately, this acknowledgment may appear in the software itself,
- if and wherever such third-party acknowledgments normally appear.
-
- 4. The names "CyberNeko" and "NekoHTML" must not be used to endorse
- or promote products derived from this software without prior
- written permission. For written permission, please contact
- andyc@cyberneko.net.
-
- 5. Products derived from this software may not be called "CyberNeko",
- nor may "CyberNeko" appear in their name, without prior written
- permission of the author.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 THE AUTHOR OR OTHER CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ====================================================================
-
- This license is based on the Apache Software License, version 1.1.
-
Modified: incubator/tika/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/tika/trunk/NOTICE.txt?rev=669307&r1=669306&r2=669307&view=diff
==============================================================================
--- incubator/tika/trunk/NOTICE.txt (original)
+++ incubator/tika/trunk/NOTICE.txt Wed Jun 18 14:59:04 2008
@@ -14,5 +14,3 @@
Copyright (c) 2003-2005, www.fontbox.org
Copyright (c) 1995-2005 International Business Machines Corporation and others
-
-(C) Copyright 2002-2005, Andy Clark.
Modified: incubator/tika/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tika/trunk/pom.xml?rev=669307&r1=669306&r2=669307&view=diff
==============================================================================
--- incubator/tika/trunk/pom.xml (original)
+++ incubator/tika/trunk/pom.xml Wed Jun 18 14:59:04 2008
@@ -194,9 +194,9 @@
<version>3.0.2-FINAL</version>
</dependency>
<dependency>
- <groupId>nekohtml</groupId>
+ <groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>0.9.5</version>
+ <version>1.9.7</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>