jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r669304 - in /jackrabbit/trunk: ./ jackrabbit-jca/src/main/rar/META-INF/ jackrabbit-text-extractors/ jackrabbit-webapp/src/main/webapp/META-INF/
Date Wed, 18 Jun 2008 21:51:05 GMT
Author: jukka
Date: Wed Jun 18 14:51:05 2008
New Revision: 669304

URL: http://svn.apache.org/viewvc?rev=669304&view=rev
Log:
JCR-1655: Upgrade nekohtml dependency
    - Upgraded to net.sourceforge.nekohtml:nekohtml:1.9.7
    - This version is ALv2 without a NOTICE file

Modified:
    jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/LICENSE.txt
    jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt
    jackrabbit/trunk/jackrabbit-text-extractors/pom.xml
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/LICENSE.txt
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE.txt
    jackrabbit/trunk/pom.xml

Modified: jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/LICENSE.txt?rev=669304&r1=669303&r2=669304&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/LICENSE.txt (original)
+++ jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/LICENSE.txt Wed Jun 18 14:51:05
2008
@@ -348,55 +348,6 @@
     OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-CyberNeko HTML Parser library (nekohtml-0.9.4.jar)
-
-    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.
-
 XML API library, org.w3c classes (xml-apis-1.0.03.jar)
 
     DOM Java Language Binding:

Modified: jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt?rev=669304&r1=669303&r2=669304&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt (original)
+++ jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt Wed Jun 18 14:51:05 2008
@@ -23,8 +23,6 @@
 
 This software contains SLF4J libraries. Copyright (c) 2004-2008 QOS.ch
 
-CyberNeko HTML Parser (C) Copyright 2002-2005, Andy Clark.
-
 This product includes Apache Xerces, portions of which were
 originally based on the following:
 - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.

Modified: jackrabbit/trunk/jackrabbit-text-extractors/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-text-extractors/pom.xml?rev=669304&r1=669303&r2=669304&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-text-extractors/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-text-extractors/pom.xml Wed Jun 18 14:51:05 2008
@@ -78,20 +78,9 @@
       <artifactId>pdfbox</artifactId>
     </dependency>
     <dependency>
-      <groupId>nekohtml</groupId>
+      <groupId>net.sourceforge.nekohtml</groupId>
       <artifactId>nekohtml</artifactId>
-      <exclusions>
-        <!-- JCR-700: Incomplete dependency from nekohtml 0.9.4 -->
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xerces</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <!-- JCR-700: Replacement for the nekohtml xerces dependency -->
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
+      <version>1.9.7</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/LICENSE.txt?rev=669304&r1=669303&r2=669304&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/LICENSE.txt (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/LICENSE.txt Wed Jun 18 14:51:05
2008
@@ -348,55 +348,6 @@
     OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-CyberNeko HTML Parser library (nekohtml-0.9.4.jar)
-
-    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.
-
 XML API library, org.w3c classes (xml-apis-1.0.03.jar)
 
     DOM Java Language Binding:

Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE.txt?rev=669304&r1=669303&r2=669304&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE.txt (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE.txt Wed Jun 18 14:51:05
2008
@@ -23,8 +23,6 @@
 
 This software contains SLF4J libraries. Copyright (c) 2004-2008 QOS.ch
 
-CyberNeko HTML Parser (C) Copyright 2002-2005, Andy Clark.
-
 This product includes Apache Xerces, portions of which were
 originally based on the following:
 - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.

Modified: jackrabbit/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/pom.xml?rev=669304&r1=669303&r2=669304&view=diff
==============================================================================
--- jackrabbit/trunk/pom.xml (original)
+++ jackrabbit/trunk/pom.xml Wed Jun 18 14:51:05 2008
@@ -862,11 +862,6 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>nekohtml</groupId>
-        <artifactId>nekohtml</artifactId>
-        <version>0.9.4</version>
-      </dependency>
-      <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         <version>1.0</version>



Mime
View raw message