You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ma...@apache.org on 2011/08/19 19:14:00 UTC

svn commit: r1159687 - in /hadoop/common/trunk/hadoop-mapreduce: CHANGES.txt hadoop-yarn/pom.xml pom.xml

Author: mahadev
Date: Fri Aug 19 17:14:00 2011
New Revision: 1159687

URL: http://svn.apache.org/viewvc?rev=1159687&view=rev
Log:
MAPREDUCE-2860. Fix log4j logging in the maven test cases. (mahadev)

Modified:
    hadoop/common/trunk/hadoop-mapreduce/CHANGES.txt
    hadoop/common/trunk/hadoop-mapreduce/hadoop-yarn/pom.xml
    hadoop/common/trunk/hadoop-mapreduce/pom.xml

Modified: hadoop/common/trunk/hadoop-mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/CHANGES.txt?rev=1159687&r1=1159686&r2=1159687&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce/CHANGES.txt Fri Aug 19 17:14:00 2011
@@ -1116,7 +1116,8 @@ Trunk (unreleased changes)
 
     MAPREDUCE-2727. Fix divide-by-zero error in SleepJob for sleepCount equals
     0. (Jeffrey Naisbitt via acmurthy)
-
+ 
+    MAPREDUCE-2860. Fix log4j logging in the maven test cases. (mahadev)
 
 Release 0.22.0 - Unreleased
 

Modified: hadoop/common/trunk/hadoop-mapreduce/hadoop-yarn/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/hadoop-yarn/pom.xml?rev=1159687&r1=1159686&r2=1159687&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/hadoop-yarn/pom.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/hadoop-yarn/pom.xml Fri Aug 19 17:14:00 2011
@@ -258,6 +258,7 @@
             <systemPropertyVariables>
               <build.dir>${project.build.directory}</build.dir>
               <build.output.dir>${project.build.outputDirectory}</build.output.dir>
+              <log4j.configuration>file:///${yarn.basedir}/../src/test/log4j.properties</log4j.configuration>
             </systemPropertyVariables>
           </configuration>
         </plugin>

Modified: hadoop/common/trunk/hadoop-mapreduce/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/pom.xml?rev=1159687&r1=1159686&r2=1159687&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/pom.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/pom.xml Fri Aug 19 17:14:00 2011
@@ -210,7 +210,7 @@
             <systemPropertyVariables>
               <build.dir>${project.build.directory}</build.dir>
               <build.output.dir>${project.build.outputDirectory}</build.output.dir>
-              <log4j.configuration>file:/home/vinodkv/Workspace/eclipse-workspace/apache-git/hadoop-common/mapreduce/src/test/log4j.properties</log4j.configuration>  
+              <log4j.configuration>file:///${mr.basedir}/src/test/log4j.properties</log4j.configuration>  
             </systemPropertyVariables>
           </configuration>
         </plugin>