From ddda1b6089565754879e7379db01836ac3e74e77 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Thu, 6 Sep 2012 22:47:01 +0000
Subject: [PATCH] SOLR-3686: fix solr/core and solr/solrj not to share a lib
 directory

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1381792 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/common-build.xml |  3 ++-
 solr/core/build.xml   |  6 ------
 solr/solrj/build.xml  | 17 ++---------------
 solr/webapp/build.xml |  4 ++--
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/solr/common-build.xml b/solr/common-build.xml
index 175860bcc64..25de5735eee 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -55,7 +55,8 @@
   <import file="${common-solr.dir}/../lucene/module-build.xml"/>
 
   <path id="additional.dependencies">
-  	<fileset dir="${common-solr.dir}/lib" excludes="${common.classpath.excludes}"/>
+  	<fileset dir="${common-solr.dir}/core/lib" excludes="${common.classpath.excludes}"/>
+  	<fileset dir="${common-solr.dir}/solrj/lib" excludes="${common.classpath.excludes}"/>
   	<fileset dir="${common-solr.dir}/example/lib" excludes="${common.classpath.excludes}"/>
   	<fileset dir="${common-solr.dir}/example/example-DIH/solr/db/lib" excludes="${common.classpath.excludes}"/>  	
   	<fileset dir="lib" excludes="${common.classpath.excludes}" erroronmissingdir="false"/>
diff --git a/solr/core/build.xml b/solr/core/build.xml
index 148883da7f2..f8b0d66c926 100644
--- a/solr/core/build.xml
+++ b/solr/core/build.xml
@@ -18,12 +18,6 @@
 <project name="solr-core" default="default">
   <description>Solr Core</description>
 
-  <!-- hackidty-hack-hack -->
-
-  <property name="ivy.retrieve.pattern" value="${common-solr.dir}/lib/[artifact]-[revision].[ext]"/>
-  <!-- we cannot sync because solr/core and solr/solrj share the same lib/... clean this up! -->
-  <property name="ivy.sync" value="false"/>
-
   <!-- html file for testing -->
   <property name="rat.excludes" value="**/htmlStripReaderTest.html"/>
 
diff --git a/solr/solrj/build.xml b/solr/solrj/build.xml
index 048eba54ceb..b0a5f6e8918 100644
--- a/solr/solrj/build.xml
+++ b/solr/solrj/build.xml
@@ -18,11 +18,6 @@
 <project name="solr-solrj" default="default">
   <description>Solrj - Solr Java Client</description>
 
-  <property name="ivy.retrieve.pattern" value="${common-solr.dir}/lib/[artifact]-[revision].[ext]"/>
-
-  <!-- we cannot sync because solr/core and solr/solrj share the same lib/... clean this up! -->
-  <property name="ivy.sync" value="false"/>
-
   <import file="../common-build.xml"/>
 
   <!-- Specialized common-solr.test.classpath, to remove the Solr core test output -->
@@ -35,16 +30,8 @@
   <target name="dist" depends="common-solr.dist">
     <mkdir  dir="${dist}/solrj-lib" />
     <copy todir="${dist}/solrj-lib">
-      <fileset dir="${common-solr.dir}/lib">
-        <include name="commons-codec-*.jar"/>
-        <include name="commons-io-*.jar"/>
-        <include name="httpcore*.jar"/>
-        <include name="httpclient*.jar"/>
-        <include name="httpmime*.jar"/>
-        <include name="*stax-*.jar" />
-        <include name="wstx-*.jar" />
-        <include name="jcl-over-slf4j-*.jar" />
-        <include name="slf4j-api-*.jar" />
+      <fileset dir="${common-solr.dir}/solrj/lib">
+        <include name="*.jar"/>
       </fileset>
     </copy>
   </target>
diff --git a/solr/webapp/build.xml b/solr/webapp/build.xml
index 8195438721d..35698b73050 100644
--- a/solr/webapp/build.xml
+++ b/solr/webapp/build.xml
@@ -47,11 +47,11 @@
     <war destfile="${dist}/apache-solr-${version}${solr.war.suffix}.war"
          webxml="web/WEB-INF/web.xml"
          manifest="${manifest.file}">
-      <lib dir="${common-solr.dir}/lib" excludes="${exclude.from.war},${common.classpath.excludes}">
+      <lib dir="${common-solr.dir}/core/lib" excludes="${exclude.from.war},${common.classpath.excludes}">
         <exclude name="servlet-api*.jar" />
         <exclude name="easymock-*.jar" />
-        <exclude name="junit-*.jar" />
       </lib>
+      <lib dir="${common-solr.dir}/solrj/lib" excludes="${exclude.from.war},${common.classpath.excludes}"/>
       <lib dir="${lucene-libs}" excludes="${exclude.from.war},${common.classpath.excludes}" />
       <lib dir="${dist}" excludes="${exclude.from.war},${common.classpath.excludes}">
         <include name="apache-solr-solrj-${version}.jar" />