From 90fe7bcc3b30f8497d7a5124c91c5aea28f2fccb Mon Sep 17 00:00:00 2001
From: Andrew Wang <wang@apache.org>
Date: Thu, 27 Aug 2015 10:17:00 -0700
Subject: [PATCH] HADOOP-12362. Set hadoop.tmp.dir and hadoop.log.dir in pom.
 Contributed by Charlie Helin.

---
 hadoop-common-project/hadoop-common/CHANGES.txt              | 3 +++
 hadoop-project/pom.xml                                       | 4 ++--
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 0ec4ed6709..95eb677278 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1079,6 +1079,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-12347. Fix mismatch parameter name in javadocs of
     AuthToken#setMaxInactives (xyao)
 
+    HADOOP-12362. Set hadoop.tmp.dir and hadoop.log.dir in pom.
+    (Charlie Helin via wang)
+
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 023b1c4f03..86102c674d 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1121,14 +1121,14 @@
           </environmentVariables>
           <systemPropertyVariables>
 
+            <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+            <hadoop.tmp.dir>${project.build.directory}/tmp</hadoop.tmp.dir>
 
             <!-- TODO: all references in testcases should be updated to this default -->
             <test.build.dir>${test.build.dir}</test.build.dir>
-            <hadoop.tmp.dir>${hadoop.tmp.dir}</hadoop.tmp.dir>
             <test.build.data>${test.build.data}</test.build.data>
             <test.build.webapps>${test.build.webapps}</test.build.webapps>
             <test.cache.data>${test.cache.data}</test.cache.data>
-            <hadoop.log.dir>${hadoop.log.dir}</hadoop.log.dir>
             <test.build.classes>${test.build.classes}</test.build.classes>
 
             <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
index 95bcb4fc10..52994e7d5a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
@@ -187,14 +187,14 @@
         </environmentVariables>
         <systemPropertyVariables>
 
+          <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+          <hadoop.tmp.dir>${project.build.directory}/tmp</hadoop.tmp.dir>
 
           <!-- TODO: all references in testcases should be updated to this default -->
           <test.build.dir>${test.build.dir}</test.build.dir>
-          <hadoop.tmp.dir>${hadoop.tmp.dir}</hadoop.tmp.dir>
           <test.build.data>${test.build.data}</test.build.data>
           <test.build.webapps>${test.build.webapps}</test.build.webapps>
           <test.cache.data>${test.cache.data}</test.cache.data>
-          <hadoop.log.dir>${hadoop.log.dir}</hadoop.log.dir>
           <test.build.classes>${test.build.classes}</test.build.classes>
 
           <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>