You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/07/27 15:49:41 UTC
svn commit: r1366383 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/benchmark/ lucene/benchmark/lib/ solr/ solr/contrib/
solr/contrib/extraction/ solr/contrib/extraction/lib/
Author: rmuir
Date: Fri Jul 27 13:49:40 2012
New Revision: 1366383
URL: http://svn.apache.org/viewvc?rev=1366383&view=rev
Log:
LUCENE-4263: remove conflicting versions of the same jar dependencies
Added:
lucene/dev/branches/branch_4x/lucene/benchmark/lib/commons-compress-1.3.jar.sha1
- copied unchanged from r1366381, lucene/dev/trunk/lucene/benchmark/lib/commons-compress-1.3.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/xercesImpl-2.9.1.jar.sha1
- copied unchanged from r1366381, lucene/dev/trunk/solr/contrib/extraction/lib/xercesImpl-2.9.1.jar.sha1
Removed:
lucene/dev/branches/branch_4x/lucene/benchmark/lib/commons-compress-1.2.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/asm-3.1.jar.sha1
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/asm-LICENSE-BSD_LIKE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/asm-NOTICE.txt
lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/xercesImpl-2.8.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/benchmark/ (props changed)
lucene/dev/branches/branch_4x/lucene/benchmark/build.xml
lucene/dev/branches/branch_4x/lucene/benchmark/ivy.xml
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/build.xml?rev=1366383&r1=1366382&r2=1366383&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/build.xml Fri Jul 27 13:49:40 2012
@@ -153,7 +153,7 @@
<fileset dir="${common.dir}/analysis/icu/lib" includes="icu4j-49.1.jar"/>
<path refid="base.classpath"/>
<fileset dir="lib">
- <include name="commons-compress-1.2.jar"/>
+ <include name="commons-compress-1.3.jar"/>
<include name="xercesImpl-2.9.1.jar"/>
<include name="nekohtml-1.9.15.jar"/>
</fileset>
Modified: lucene/dev/branches/branch_4x/lucene/benchmark/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/ivy.xml?rev=1366383&r1=1366382&r2=1366383&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/ivy.xml Fri Jul 27 13:49:40 2012
@@ -19,7 +19,7 @@
<ivy-module version="2.0">
<info organisation="org.apache.lucene" module="benchmark"/>
<dependencies>
- <dependency org="org.apache.commons" name="commons-compress" rev="1.2" transitive="false"/>
+ <dependency org="org.apache.commons" name="commons-compress" rev="1.3" transitive="false"/>
<dependency org="xerces" name="xercesImpl" rev="2.9.1" transitive="false"/>
<dependency org="net.sourceforge.nekohtml" name="nekohtml" rev="1.9.15" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
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=1366383&r1=1366382&r2=1366383&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml Fri Jul 27 13:49:40 2012
@@ -43,7 +43,6 @@
<dependency org="org.apache.xmlbeans" name="xmlbeans" rev="2.3.0" transitive="false"/>
<dependency org="dom4j" name="dom4j" rev="1.6.1" transitive="false"/>
<dependency org="org.ccil.cowan.tagsoup" name="tagsoup" rev="1.2.1" transitive="false"/>
- <dependency org="asm" name="asm" rev="3.1" transitive="false"/>
<dependency org="com.googlecode.mp4parser" name="isoparser" rev="1.0-beta-5" transitive="false"/>
<dependency org="net.sf.scannotation" name="scannotation" rev="1.0.2" transitive="false"/>
<dependency org="javassist" name="javassist" rev="3.6.0.GA" transitive="false"/>
@@ -53,7 +52,7 @@
<dependency org="jdom" name="jdom" rev="1.0" transitive="false"/>
<!-- Other ExtracingRequestHandler dependencies -->
<dependency org="com.ibm.icu" name="icu4j" rev="49.1" transitive="false"/>
- <dependency org="xerces" name="xercesImpl" rev="2.8.1" transitive="false"/>
+ <dependency org="xerces" name="xercesImpl" rev="2.9.1" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>