From a0ccd37bb1d5492672af45ae09b03352bcfae53a Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Mon, 10 Dec 2012 18:39:35 +0000
Subject: [PATCH] LUCENE-4611: remove duplicate 3rd party versioning from
 build.xmls

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1419644 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/analysis/icu/build.xml        |  2 +-
 lucene/analysis/kuromoji/build.xml   |  2 +-
 lucene/analysis/morfologik/build.xml |  4 +---
 lucene/analysis/phonetic/build.xml   |  2 +-
 lucene/analysis/uima/build.xml       |  4 +---
 lucene/benchmark/build.xml           | 12 ++++--------
 lucene/demo/build.xml                |  4 ++--
 lucene/sandbox/build.xml             |  2 +-
 lucene/spatial/build.xml             |  2 +-
 lucene/tools/build.xml               |  4 +---
 10 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/lucene/analysis/icu/build.xml b/lucene/analysis/icu/build.xml
index 61a5a36d9ee..fcd9201b5e6 100644
--- a/lucene/analysis/icu/build.xml
+++ b/lucene/analysis/icu/build.xml
@@ -26,7 +26,7 @@
   <import file="../analysis-module-build.xml"/>
 
   <path id="icujar">
-     <pathelement location="lib/icu4j-49.1.jar"/>
+     <fileset dir="lib"/>
   </path>
 
   <path id="classpath">
diff --git a/lucene/analysis/kuromoji/build.xml b/lucene/analysis/kuromoji/build.xml
index 256440cd402..7ec776b8901 100644
--- a/lucene/analysis/kuromoji/build.xml
+++ b/lucene/analysis/kuromoji/build.xml
@@ -64,7 +64,7 @@
   </target>
 
   <path id="tools.dependencies">
-    <fileset dir="../icu/lib" includes="icu4j-49.1.jar"/>
+    <fileset dir="../icu/lib"/>
   </path>
 
   <path id="tools.classpath">
diff --git a/lucene/analysis/morfologik/build.xml b/lucene/analysis/morfologik/build.xml
index d4455c7fc58..160b20d0d3d 100644
--- a/lucene/analysis/morfologik/build.xml
+++ b/lucene/analysis/morfologik/build.xml
@@ -27,9 +27,7 @@
 
   <path id="classpath">
     <pathelement path="${analyzers-common.jar}"/>
-    <pathelement path="lib/morfologik-fsa-1.5.3.jar"/>
-    <pathelement path="lib/morfologik-polish-1.5.3.jar"/>
-    <pathelement path="lib/morfologik-stemming-1.5.3.jar"/>
+    <fileset dir="lib"/>
     <path refid="base.classpath"/>
   </path>
 
diff --git a/lucene/analysis/phonetic/build.xml b/lucene/analysis/phonetic/build.xml
index a33e499ed04..49d5726966a 100644
--- a/lucene/analysis/phonetic/build.xml
+++ b/lucene/analysis/phonetic/build.xml
@@ -27,7 +27,7 @@
 
   <path id="classpath">
     <pathelement path="${analyzers-common.jar}"/>
-    <pathelement path="lib/commons-codec-1.7.jar"/>
+    <fileset dir="lib"/>
     <path refid="base.classpath"/>
   </path>
 
diff --git a/lucene/analysis/uima/build.xml b/lucene/analysis/uima/build.xml
index 2a8c046344b..ca392ebc11a 100644
--- a/lucene/analysis/uima/build.xml
+++ b/lucene/analysis/uima/build.xml
@@ -27,9 +27,7 @@
   <property name="tests.jvms.override" value="1" />
 
   <path id="uimajars">
-    <pathelement path="lib/uimaj-core-2.3.1.jar"/>
-    <pathelement path="lib/Tagger-2.3.1.jar"/>
-    <pathelement path="lib/WhitespaceTokenizer-2.3.1.jar"/>
+    <fileset dir="lib"/>
   </path>
 
   <import file="../analysis-module-build.xml"/>
diff --git a/lucene/benchmark/build.xml b/lucene/benchmark/build.xml
index ca274cdddbd..1b5d5367a7e 100644
--- a/lucene/benchmark/build.xml
+++ b/lucene/benchmark/build.xml
@@ -147,13 +147,9 @@
       <pathelement path="${analyzers-common.jar}"/>
       <pathelement path="${queryparser.jar}"/>
       <pathelement path="${facet.jar}"/>
-      <fileset dir="${common.dir}/analysis/icu/lib" includes="icu4j-49.1.jar"/>
+      <fileset dir="${common.dir}/analysis/icu/lib"/>
       <path refid="base.classpath"/>
-    	<fileset dir="lib">
-    	  <include name="commons-compress-1.4.1.jar"/>
-    	  <include name="xercesImpl-2.9.1.jar"/>
-    	  <include name="nekohtml-1.9.17.jar"/>
-    	</fileset>
+      <fileset dir="lib"/>
     </path>
     <path id="run.classpath">
         <path refid="classpath"/>
@@ -204,8 +200,8 @@
 	
 	<path id="collation.runtime.classpath">
 	  <path refid="run.classpath"/>
-    <pathelement path="${analyzers-icu.jar}"/>
-    <fileset dir="${common.dir}/analysis/icu/lib" includes="icu4j-49.1.jar"/>
+      <pathelement path="${analyzers-icu.jar}"/>
+      <fileset dir="${common.dir}/analysis/icu/lib"/>
 	</path>
 	
 	<target name="collation" depends="compile,jar-analyzers-icu,top-100k-wiki-word-files">
diff --git a/lucene/demo/build.xml b/lucene/demo/build.xml
index 84dcfa167ab..3137643850b 100644
--- a/lucene/demo/build.xml
+++ b/lucene/demo/build.xml
@@ -30,10 +30,10 @@
   <target name="init" depends="module-build.init,jar-lucene-core"/>
   
   <path id="classpath">
-	 <pathelement path="${analyzers-common.jar}"/>
+   <pathelement path="${analyzers-common.jar}"/>
    <pathelement path="${queryparser.jar}"/>
    <pathelement path="${lucene-core.jar}"/>
-   <pathelement location="lib/servlet-api-2.4.jar"/>
+   <fileset dir="lib"/>
   </path>
 
   <target name="javadocs" depends="javadocs-analyzers-common,javadocs-queryparser,compile-core">
diff --git a/lucene/sandbox/build.xml b/lucene/sandbox/build.xml
index 32482a17957..1c44b287229 100644
--- a/lucene/sandbox/build.xml
+++ b/lucene/sandbox/build.xml
@@ -24,7 +24,7 @@
   <import file="../module-build.xml"/>
 
   <path id="classpath">
-    <pathelement path="lib/jakarta-regexp-1.4.jar"/>
+    <fileset dir="lib"/>
     <path refid="base.classpath"/>
   </path>
 
diff --git a/lucene/spatial/build.xml b/lucene/spatial/build.xml
index 4fe62f7767c..37505e60d75 100644
--- a/lucene/spatial/build.xml
+++ b/lucene/spatial/build.xml
@@ -7,7 +7,7 @@
   <import file="../module-build.xml"/>
 
   <path id="spatialjar">
-     <pathelement path="lib/spatial4j-0.3.jar"/>
+     <fileset dir="lib"/>
   </path>
 
   <path id="classpath">
diff --git a/lucene/tools/build.xml b/lucene/tools/build.xml
index 7805711f14b..55f5b4a2cd7 100644
--- a/lucene/tools/build.xml
+++ b/lucene/tools/build.xml
@@ -25,9 +25,7 @@
   <import file="../common-build.xml"/>
 
   <path id="classpath">
-    <fileset dir="lib">
-      <include name="asm-debug-all-4.1.jar"/>
-    </fileset>
+    <fileset dir="lib"/>
   </path>
 
   <!--