svn commit: r1669450 - in /lucene/dev/branches/branch_5x: ./ lucene/ solr/ solr/contrib/ solr/contrib/extraction/ solr/licenses/

[sh...@apache.org]

Author: shaie
Date: Thu Mar 26 21:40:43 2015
New Revision: 1669450

URL: http://svn.apache.org/r1669450
Log:
SOLR-7317: Remove jhighlight.jar which contains LGPL-only code

Removed:
    lucene/dev/branches/branch_5x/solr/licenses/jhighlight-1.0.jar.sha1
    lucene/dev/branches/branch_5x/solr/licenses/jhighlight-LICENSE-CDDL.txt
Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/ivy-versions.properties   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/contrib/   (props changed)
    lucene/dev/branches/branch_5x/solr/contrib/extraction/ivy.xml
    lucene/dev/branches/branch_5x/solr/licenses/   (props changed)

Modified: lucene/dev/branches/branch_5x/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/ivy-versions.properties?rev=1669450&r1=1669449&r2=1669450&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/branch_5x/lucene/ivy-versions.properties Thu Mar 26 21:40:43 2015
@@ -54,7 +54,6 @@ com.sun.jersey.version = 1.9
 /com.tdunning/t-digest = 3.0
 /com.thoughtworks.paranamer/paranamer = 2.3
 /com.typesafe/config = 1.0.2
-/com.uwyn/jhighlight = 1.0
 /commons-beanutils/commons-beanutils = 1.8.3
 /commons-cli/commons-cli = 1.2
 /commons-codec/commons-codec = 1.10

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1669450&r1=1669449&r2=1669450&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Thu Mar 26 21:40:43 2015
@@ -29,7 +29,7 @@ Upgrading from Solr 5.0
   addition to SolrServerException, to bring them in line with the update
   functions.
 
-* SolrRequest.process() is now final.  Subclasses should instead be parametrized
+* SolrRequest.process() is now final.  Subclasses should instead be parameterized
   by their corresponding SolrResponse type, and implement createResponse()
 
 * The signature of SolrDispatchFilter.createCoreContainer() has changed to take
@@ -37,6 +37,10 @@ Upgrading from Solr 5.0
 
 * Deprecated the 'lib' option added to create-requesthandler as part of SOLR-6801 in 5.0 release.
   Please use the add-runtimelib command
+  
+* Tika's runtime dependency of 'jhighlight' was removed as the latter was found to 
+  contain some LGPL-only code. Until that's resolved by Tika, you can download the
+  .jar yourself and place it under contrib/extraction/lib.  
 
 Detailed Change List
 ----------------------

Modified: lucene/dev/branches/branch_5x/solr/contrib/extraction/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/extraction/ivy.xml?rev=1669450&r1=1669449&r2=1669450&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/extraction/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/extraction/ivy.xml Thu Mar 26 21:40:43 2015
@@ -57,7 +57,6 @@
     <dependency org="com.googlecode.juniversalchardet" name="juniversalchardet" rev="${/com.googlecode.juniversalchardet/juniversalchardet}" conf="compile"/>
     <dependency org="org.tukaani" name="xz" rev="${/org.tukaani/xz}" conf="compile"/>
     <dependency org="com.adobe.xmp" name="xmpcore" rev="${/com.adobe.xmp/xmpcore}" conf="compile"/>
-    <dependency org="com.uwyn" name="jhighlight" rev="${/com.uwyn/jhighlight}" conf="compile"/>
     <dependency org="com.pff" name="java-libpst" rev="${/com.pff/java-libpst}" conf="compile"/>
     <dependency org="net.sourceforge.jmatio" name="jmatio" rev="${/net.sourceforge.jmatio/jmatio}" conf="compile"/>