You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2014/06/05 02:06:11 UTC
svn commit: r1600544 - in /lucene/dev/branches/lucene_solr_4_8: ./ lucene/
solr/ solr/contrib/ solr/contrib/extraction/ solr/licenses/
Author: sarowe
Date: Thu Jun 5 00:06:10 2014
New Revision: 1600544
URL: http://svn.apache.org/r1600544
Log:
SOLR-6130: Added com.uwyn:jhighlight dependency to, and removed asm:asm dependency from the extraction contrib - dependencies weren't fully upgraded with the Tika 1.4->1.5 upgrade (SOLR-5763) (merged trunk r1599663)
Added:
lucene/dev/branches/lucene_solr_4_8/solr/licenses/jhighlight-1.0.jar.sha1
- copied unchanged from r1599663, lucene/dev/trunk/solr/licenses/jhighlight-1.0.jar.sha1
lucene/dev/branches/lucene_solr_4_8/solr/licenses/jhighlight-LICENSE-CDDL.txt
- copied unchanged from r1599663, lucene/dev/trunk/solr/licenses/jhighlight-LICENSE-CDDL.txt
Removed:
lucene/dev/branches/lucene_solr_4_8/solr/licenses/asm-3.1.jar.sha1
Modified:
lucene/dev/branches/lucene_solr_4_8/ (props changed)
lucene/dev/branches/lucene_solr_4_8/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_8/lucene/ivy-versions.properties (contents, props changed)
lucene/dev/branches/lucene_solr_4_8/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_8/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_8/solr/contrib/ (props changed)
lucene/dev/branches/lucene_solr_4_8/solr/contrib/extraction/ivy.xml
lucene/dev/branches/lucene_solr_4_8/solr/licenses/ (props changed)
Modified: lucene/dev/branches/lucene_solr_4_8/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_8/lucene/ivy-versions.properties?rev=1600544&r1=1600543&r2=1600544&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_8/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/lucene_solr_4_8/lucene/ivy-versions.properties Thu Jun 5 00:06:10 2014
@@ -4,7 +4,6 @@
/aopalliance/aopalliance = 1.0
-/asm/asm = 3.1
/cglib/cglib-nodep = 2.2
/com.adobe.xmp/xmpcore = 5.1.2
@@ -49,6 +48,7 @@ com.sun.jersey.version = 1.8
/com.sun.xml.bind/jaxb-impl = 2.2.2
/com.thoughtworks.paranamer/paranamer = 2.3
/com.typesafe/config = 1.0.2
+/com.uwyn/jhighlight = 1.0
/commons-beanutils/commons-beanutils = 1.7.0
/commons-cli/commons-cli = 1.2
/commons-codec/commons-codec = 1.9
Modified: lucene/dev/branches/lucene_solr_4_8/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_8/solr/CHANGES.txt?rev=1600544&r1=1600543&r2=1600544&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_8/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_8/solr/CHANGES.txt Thu Jun 5 00:06:10 2014
@@ -20,6 +20,16 @@ See the tutorial at http://lucene.apache
$Id$
+
+================== 4.8.2 ==================
+
+Build
+----------------------
+
+* SOLR-6130: Added com.uwyn:jhighlight dependency to, and removed asm:asm
+ dependency from the extraction contrib - dependencies weren't fully
+ upgraded with the Tika 1.4->1.5 upgrade (SOLR-5763). (Steve Rowe)
+
================== 4.8.1 ==================
Bug Fixes
Modified: lucene/dev/branches/lucene_solr_4_8/solr/contrib/extraction/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_8/solr/contrib/extraction/ivy.xml?rev=1600544&r1=1600543&r2=1600544&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_8/solr/contrib/extraction/ivy.xml (original)
+++ lucene/dev/branches/lucene_solr_4_8/solr/contrib/extraction/ivy.xml Thu Jun 5 00:06:10 2014
@@ -53,7 +53,7 @@
<dependency org="com.googlecode.juniversalchardet" name="juniversalchardet" rev="${/com.googlecode.juniversalchardet/juniversalchardet}" transitive="false"/>
<dependency org="org.tukaani" name="xz" rev="${/org.tukaani/xz}" transitive="false"/>
<dependency org="com.adobe.xmp" name="xmpcore" rev="${/com.adobe.xmp/xmpcore}" transitive="false"/>
- <dependency org="asm" name="asm" rev="${/asm/asm}" transitive="false"/>
+ <dependency org="com.uwyn" name="jhighlight" rev="${/com.uwyn/jhighlight}" transitive="false"/>
<!-- Other ExtracingRequestHandler dependencies -->
<dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" transitive="false"/>