lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1599672 - in /lucene/dev/branches/branch_4x: ./ lucene/ solr/ solr/contrib/ solr/contrib/extraction/ solr/licenses/
Date Tue, 03 Jun 2014 16:41:45 GMT
Author: sarowe
Date: Tue Jun  3 16:41:44 2014
New Revision: 1599672

URL: http://svn.apache.org/r1599672
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/branch_4x/solr/licenses/jhighlight-1.0.jar.sha1
      - copied unchanged from r1599663, lucene/dev/trunk/solr/licenses/jhighlight-1.0.jar.sha1
    lucene/dev/branches/branch_4x/solr/licenses/jhighlight-LICENSE-CDDL.txt
      - copied unchanged from r1599663, lucene/dev/trunk/solr/licenses/jhighlight-LICENSE-CDDL.txt
Removed:
    lucene/dev/branches/branch_4x/solr/licenses/asm-3.1.jar.sha1
Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/ivy-ignore-conflicts.properties   (contents, props
changed)
    lucene/dev/branches/branch_4x/lucene/ivy-versions.properties   (contents, props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_4x/solr/contrib/   (props changed)
    lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml
    lucene/dev/branches/branch_4x/solr/licenses/   (props changed)

Modified: lucene/dev/branches/branch_4x/lucene/ivy-ignore-conflicts.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/ivy-ignore-conflicts.properties?rev=1599672&r1=1599671&r2=1599672&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/ivy-ignore-conflicts.properties (original)
+++ lucene/dev/branches/branch_4x/lucene/ivy-ignore-conflicts.properties Tue Jun  3 16:41:44
2014
@@ -9,7 +9,6 @@
 # where each <versionX> is an indirect dependency version to ignore (i.e., not
 # trigger a conflict) when the ant check-lib-versions target is run.
 
-/asm/asm = 3.2
 /com.google.guava/guava = 16.0.1
 
 com.sun.jersey.ignore.versions = 1.9

Modified: lucene/dev/branches/branch_4x/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/ivy-versions.properties?rev=1599672&r1=1599671&r2=1599672&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/branch_4x/lucene/ivy-versions.properties Tue Jun  3 16:41:44 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/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1599672&r1=1599671&r2=1599672&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Tue Jun  3 16:41:44 2014
@@ -129,6 +129,10 @@ Build
 * SOLR-6006: Separate test and compile scope dependencies in the Solrj and
   Solr contrib ivy.xml files, so that the derived Maven dependencies get
   filled out properly in the corresponding POMs. (Steven Scott, Steve Rowe)
+  
+* 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 ==================
 

Modified: lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml?rev=1599672&r1=1599671&r2=1599672&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml Tue Jun  3 16:41:44 2014
@@ -57,7 +57,7 @@
     <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="asm" name="asm" rev="${/asm/asm}" conf="compile->*"/>
+    <dependency org="com.uwyn" name="jhighlight" rev="${/com.uwyn/jhighlight}" conf="compile->*"/>
 
     <!-- Other ExtractingRequestHandler dependencies -->
     <dependency org="com.ibm.icu" name="icu4j" rev="${/com.ibm.icu/icu4j}" conf="compile->*"/>



Mime
View raw message