MAPREDUCE-3151. Contrib tests failing. (Contributed byJoep Rottinghuis)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1180285 13f79535-47bb-0310-9956-ffa450edef68

mapreduce/CHANGES.txt

@@ -619,6 +619,8 @@ Release 0.22.0 - Unreleased
     MAPREDUCE-2531. Fixed jobcontrol to downgrade JobID. (Robert Evans via
     acmurthy)
 
+    MAPREDUCE-3151. Contrib tests failing (Joep Rottinghuis via cos)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES

mapreduce/src/contrib/build.xml

@@ -84,8 +84,17 @@
       <property name="hadoop.root" location="${root}/../../../"/>
       <property name="build.contrib.dir" location="${hadoop.root}/build/contrib"/>
       <delete file="${build.contrib.dir}/testsfailed"/>
-    <subant target="test" inheritAll="true">
+    <subant target="test">
       <property name="continueOnFailure" value="true"/>
+      <property name="version" value="${version}"/>
+      <property name="dist.dir" value="${dist.dir}"/>
+      <property name="hadoop-version" value="${hadoop-common.version}"/>
+      <property name="clover.jar" value="${clover.jar}"/>
+      <property name="hadoop-common.version" value="${hadoop-common.version}"/>
+      <property name="hadoop-hdfs.version" value="${hadoop-hdfs.version}"/>
+      <property name="ivy_repo_url" value="${ivy_repo_url}"/>
+      <property name="offline" value="${offline}"/>
+      <property name="resolvers" value="${resolvers}"/>
       <fileset dir="." includes="streaming/build.xml"/> 
       <fileset dir="." includes="fairscheduler/build.xml"/> 
       <fileset dir="." includes="capacity-scheduler/build.xml"/>  
@@ -107,7 +116,7 @@
       <property name="hadoop.root" location="${root}/../../../"/>
       <property name="build.contrib.dir" location="${hadoop.root}/build/contrib"/>
       <delete file="${build.contrib.dir}/testsfailed"/>
-      <subant target="test-system" inheritAll="true">
+      <subant target="test-system">
         <property name="continueOnFailure" value="true"/>
         <property name="version" value="${version}"/>
         <property name="hadoop-version" value="${hadoop-common.version}"/>

mapreduce/src/contrib/capacity-scheduler/ivy.xml

@@ -33,7 +33,7 @@
     <conf name="common" visibility="private" 
       extends="runtime"
       description="artifacts needed to compile/test the application"/>
-    <conf name="test" visibility="private" extends="runtime"/>
+    <conf name="test" visibility="private" extends="common"/>
   </configurations>
 
   <publications>
@@ -57,6 +57,10 @@
                 rev="${junit.version}" conf="common->default"/>
     <dependency org="log4j" name="log4j" 
                 rev="${log4j.version}" conf="common->master"/>
+    <dependency org="org.slf4j" name="slf4j-api"
+                rev="${slf4j-api.version}" conf="common->default"/>
+    <dependency org="org.slf4j" name="slf4j-log4j12" 
+                rev="${slf4j-log4j12.version}" conf="common->master"/>
     <dependency org="org.mortbay.jetty" name="jetty-util" 
                 rev="${jetty-util.version}" conf="common->master"/>
     <dependency org="org.mortbay.jetty" name="jetty"

mapreduce/src/contrib/gridmix/ivy.xml

@@ -28,7 +28,7 @@
 
     <conf name="common" visibility="private" extends="runtime"
       description="artifacts needed to compile/test the application"/>
-    <conf name="test" visibility="private" extends="runtime"/>
+    <conf name="test" visibility="private" extends="common"/>
   </configurations>
 
   <publications>
@@ -60,6 +60,14 @@
       name="log4j"
       rev="${log4j.version}"
       conf="common->master"/>
+    <dependency org="org.slf4j"
+      name="slf4j-api"
+      rev="${slf4j-api.version}" 
+      conf="common->default"/>
+    <dependency org="org.slf4j"
+      name="slf4j-log4j12" 
+      rev="${slf4j-log4j12.version}"
+      conf="common->master"/>
     <dependency org="junit"
       name="junit"
       rev="${junit.version}"

mapreduce/src/contrib/mumak/ivy.xml

@@ -55,6 +55,14 @@
       name="log4j"
       rev="${log4j.version}"
       conf="common->master"/>
+    <dependency org="org.slf4j"
+      name="slf4j-api"
+      rev="${slf4j-api.version}" 
+      conf="common->default"/>
+    <dependency org="org.slf4j"
+      name="slf4j-log4j12" 
+      rev="${slf4j-log4j12.version}"
+      conf="common->master"/>
     <dependency org="org.codehaus.jackson"
       name="jackson-mapper-asl"
       rev="${jackson.version}"

mapreduce/src/contrib/raid/ivy.xml

@@ -28,7 +28,7 @@
 
     <conf name="common" visibility="private" extends="runtime"
       description="artifacts needed to compile/test the application"/>
-    <conf name="test" visibility="private" extends="runtime"/>
+    <conf name="test" visibility="private" extends="common"/>
   </configurations>
 
   <publications>
@@ -60,6 +60,14 @@
       name="log4j"
       rev="${log4j.version}"
       conf="common->master"/>
+    <dependency org="org.slf4j"
+      name="slf4j-api"
+      rev="${slf4j-api.version}" 
+      conf="common->default"/>
+    <dependency org="org.slf4j"
+      name="slf4j-log4j12" 
+      rev="${slf4j-log4j12.version}"
+      conf="common->master"/>
     <dependency org="junit"
       name="junit"
       rev="${junit.version}"

mapreduce/src/contrib/streaming/ivy.xml

@@ -32,7 +32,7 @@
     <conf name="common" visibility="private" 
       extends="runtime"
       description="artifacts needed to compile/test the application"/>
-    <conf name="test" visibility="private" extends="runtime"/>
+    <conf name="test" visibility="private" extends="common"/>
   </configurations>
 
   <publications>
@@ -70,5 +70,9 @@
                 rev="${log4j.version}" conf="common->master"/>
     <dependency org="org.slf4j" name="slf4j-api" 
                 rev="${slf4j-api.version}" conf="common->master"/>
+    <!-- dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}" 
+                conf="common->default"/ -->
+    <dependency org="org.slf4j" name="slf4j-log4j12" 
+                rev="${slf4j-log4j12.version}" conf="common->master"/>
   </dependencies>
 </ivy-module>