merge 1161782 from trunk

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

hadoop-mapreduce-project/CHANGES.txt

@@ -1147,6 +1147,8 @@ Release 0.23.0 - Unreleased
     (Devaraj K via acmurthy) 
 
     MAPREDUCE-2879. Fix version for MR-279 to 0.23.0. (acmurthy) 
+   
+    MAPREDUCE-2881. Fix to include log4j 1.2.16 depenency (gkesavan)
 
 Release 0.22.0 - Unreleased
 

hadoop-mapreduce-project/ivy.xml

@@ -71,9 +71,6 @@
                rev="${hadoop-hdfs.version}" conf="system->default"/>
    <dependency org="commons-logging" name="commons-logging" 
                rev="${commons-logging.version}" conf="compile->master"/>
-  <!-- <dependency org="log4j" name="log4j" rev="${log4j.version}" 
-               conf="compile->master"/>-->
-
    <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}" 
                conf="compile->master"/>
    <dependency org="org.slf4j" name="slf4j-log4j12" 

hadoop-mapreduce-project/ivy/libraries.properties

@@ -46,7 +46,7 @@ hadoop-hdfs.version=0.23.0-SNAPSHOT
 
 hsqldb.version=1.8.0.10
 
-ivy.version=2.1.0
+ivy.version=2.2.0
 
 jasper.version=5.5.12
 jdeb.version=0.8
@@ -60,7 +60,7 @@ jdiff.version=1.0.9
 
 kfs.version=0.3
 
-log4j.version=1.2.15
+log4j.version=1.2.16
 lucene-core.version=2.3.1
 
 mina-core.version=2.0.0-M5

hadoop-mapreduce-project/src/contrib/block_forensics/ivy.xml

@@ -46,5 +46,7 @@
                 rev="${hadoop-common.version}" conf="common->default"/>  
    <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core" 
                rev="${yarn.version}" conf="common->default"/>
+   <dependency org="log4j" name="log4j" rev="${log4j.version}"
+               conf="common->master"/> 
   </dependencies>
 </ivy-module>