From c959c1ac750d82fca1ddaf877e970a39ab0d2e4c Mon Sep 17 00:00:00 2001
From: Eli Collins <eli@apache.org>
Date: Mon, 13 Aug 2012 22:08:39 +0000
Subject: [PATCH] HADOOP-8687. Upgrade log4j to 1.2.17. Contributed by Eli
 Collins

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1372649 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++
 hadoop-project/pom.xml                          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 4911152148..50e8a08d0a 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -284,6 +284,8 @@ Branch-2 ( Unreleased changes )
     HADOOP-8620. Add -Drequire.fuse and -Drequire.snappy. (Colin
     Patrick McCabe via eli)
 
+    HADOOP-8687. Upgrade log4j to 1.2.17. (eli)
+
   BUG FIXES
 
     HADOOP-8372. NetUtils.normalizeHostName() incorrectly handles hostname
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index e7825c12af..8398e50a69 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -458,7 +458,7 @@
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
-        <version>1.2.15</version>
+        <version>1.2.17</version>
         <exclusions>
           <exclusion>
             <groupId>com.sun.jdmk</groupId>