mirror of https://github.com/apache/lucene.git
LUCENE-4263: remove conflicting versions of the same jar dependencies
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1366381 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
467faeaae0
commit
78ca29ee09
|
@ -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>
|
||||
|
|
|
@ -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}"/>
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
45b5ec6a16d73d98fe370cfc2e8253bddc6a297e
|
|
@ -0,0 +1 @@
|
|||
613a08bc72e2e9a43c9f87b9ff8352b47e18e3ae
|
|
@ -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>
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
c157def142714c544bdea2e6144645702adf7097
|
|
@ -1,29 +0,0 @@
|
|||
Copyright (c) 2000-2005 INRIA, France Telecom
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
|
||||
2. Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
|
||||
3. Neither the name of the copyright holders nor the names of its
|
||||
contributors may be used to endorse or promote products derived from
|
||||
this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
|
||||
THE POSSIBILITY OF SUCH DAMAGE.
|
|
@ -1,2 +0,0 @@
|
|||
Copyright (c) 2000-2005 INRIA, France Telecom
|
||||
All rights reserved.
|
|
@ -1 +0,0 @@
|
|||
25101e37ec0c907db6f0612cbf106ee519c1aef1
|
|
@ -0,0 +1 @@
|
|||
7bc7e49ddfe4fb5f193ed37ecc96c12292c8ceb6
|
Loading…
Reference in New Issue