svn commit: r1669583 - in /tika/trunk: NOTICE.txt tika-parsers/pom.xml tika-parsers/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java

[th...@apache.org]

Author: thaichat04
Date: Fri Mar 27 13:33:47 2015
New Revision: 1669583

URL: http://svn.apache.org/r1669583
Log:
TIKA-1581 - Switch using Jhighlight on CDDL/LGPL dual-licensed and update notices

Modified:
    tika/trunk/NOTICE.txt
    tika/trunk/tika-parsers/pom.xml
    tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java

Modified: tika/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/tika/trunk/NOTICE.txt?rev=1669583&r1=1669582&r2=1669583&view=diff
==============================================================================
--- tika/trunk/NOTICE.txt (original)
+++ tika/trunk/NOTICE.txt Fri Mar 27 13:33:47 2015
@@ -10,6 +10,8 @@ This software contains code derived from
 Tika-server compoment uses CDDL-licensed dependencies: jersey (http://jersey.java.net/) and 
 Grizzly (http://grizzly.java.net/)
 
+Tika-server parsers uses CDDL/LGPL dual-licensed dependencies: jhighlight (https://github.com/codelibs/jhighlight)
+
 OpenCSV: Copyright 2005 Bytecode Pty Ltd. Licensed under the Apache License, Version 2.0
 
 IPTC Photo Metadata descriptions Copyright 2010 International Press Telecommunications Council.

Modified: tika/trunk/tika-parsers/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/pom.xml?rev=1669583&r1=1669582&r2=1669583&view=diff
==============================================================================
--- tika/trunk/tika-parsers/pom.xml (original)
+++ tika/trunk/tika-parsers/pom.xml Fri Mar 27 13:33:47 2015
@@ -207,15 +207,9 @@
       <version>1.0.3</version>
     </dependency>
     <dependency>
-      <groupId>com.uwyn</groupId>
+      <groupId>org.codelibs</groupId>
       <artifactId>jhighlight</artifactId>
-      <version>1.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-      </exclusions>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>com.pff</groupId>

Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java?rev=1669583&r1=1669582&r2=1669583&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/code/SourceCodeParser.java Fri Mar 27 13:33:47 2015
@@ -48,7 +48,8 @@ import org.xml.sax.SAXException;
 import com.uwyn.jhighlight.renderer.Renderer;
 import com.uwyn.jhighlight.renderer.XhtmlRendererFactory;
 /**
- * Generic Source code parser for Java, Groovy, C++
+ * Generic Source code parser for Java, Groovy, C++.
+ * Aware: This parser uses JHightlight library (https://github.com/codelibs/jhighlight) under CDDL/LGPL dual license
  *
  * @author Hong-Thai.Nguyen
  * @since 1.6