From: Jake Farrell <jfarrell@apache.org>
Date: Tue, 26 Apr 2011 15:44:50 +0000 (+0000)
Subject: THRIFT-1155: Remove log4j dependency from java client
X-Git-Tag: 0.7.0~98
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=6ece9be5c7c5a1e4a1169dfa7f98ff1bbbe1fc47;p=common%2Fthrift.git

THRIFT-1155: Remove log4j dependency from java client
Client: java

Removed dependency for slf4j-log4j for pom and broke requirements for testing. This fixes those requirements and restores the build.



git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1096788 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/lib/java/build.xml b/lib/java/build.xml
index 87fcd71b..e7bf639f 100644
--- a/lib/java/build.xml
+++ b/lib/java/build.xml
@@ -285,7 +285,6 @@
       <!-- Thrift dependencies list -->
       <dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.5.8"/>
       <dependency groupId="commons-lang" artifactId="commons-lang" version="2.5"/>
-      <dependency groupId="junit" artifactId="junit" version="4.4"/>
       <dependency groupId="javax.servlet" artifactId="servlet-api" version="2.5"/>
       <dependency groupId="org.apache.httpcomponents" artifactId="httpclient" version="4.0.1"/>
     </artifact:pom>
@@ -302,6 +301,18 @@
       <mapper type="flatten"/>
     </copy>
 
+    <!-- Dependencies needed for testing -->
+    <artifact:dependencies filesetId="test-dependency-jars" useScope="runtime">
+      <dependency groupId="org.slf4j" artifactId="slf4j-log4j12" version="1.5.8"/>
+      <dependency groupId="junit" artifactId="junit" version="4.4"/>
+    </artifact:dependencies>
+
+    <!-- Copy the test dependencies to the build/lib dir -->
+    <copy todir="${build.dir}/lib">
+      <fileset refid="test-dependency-jars"/>
+      <mapper type="flatten"/>
+    </copy>
+
     <property name="mvn.finished" value="true"/>
   </target>