svn commit: r1096788 - /thrift/trunk/lib/java/build.xml

[jf...@apache.org]

Author: jfarrell
Date: Tue Apr 26 15:44:50 2011
New Revision: 1096788

URL: http://svn.apache.org/viewvc?rev=1096788&view=rev
Log:
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.


Modified:
    thrift/trunk/lib/java/build.xml

Modified: thrift/trunk/lib/java/build.xml
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/java/build.xml?rev=1096788&r1=1096787&r2=1096788&view=diff
==============================================================================
--- thrift/trunk/lib/java/build.xml (original)
+++ thrift/trunk/lib/java/build.xml Tue Apr 26 15:44:50 2011
@@ -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>