From 9f16abfd63122439f11adab9a1e1d8699594f681 Mon Sep 17 00:00:00 2001
From: Arun Murthy <acmurthy@apache.org>
Date: Sun, 4 Mar 2012 19:37:11 +0000
Subject: [PATCH] HADOOP-8123. Use java.home rather than env.JAVA_HOME for java
 in the project. Contributed by Jonathan Eagles.

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

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 2caacff3d6..b73cc52365 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -333,6 +333,9 @@ Release 0.23.2 - UNRELEASED
     HADOOP-8131. FsShell put doesn't correctly handle a non-existent dir
     (Daryn Sharp via bobby)
 
+    HADOOP-8123. Use java.home rather than env.JAVA_HOME for java in the
+    project. (Jonathan Eagles via acmurthy) 
+
 Release 0.23.1 - 2012-02-17 
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 1cf5a7262d..dee063166f 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -853,7 +853,7 @@
           <artifactId>jdk.tools</artifactId>
           <version>1.6</version>
           <scope>system</scope>
-          <systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath>
+          <systemPath>${java.home}/../lib/tools.jar</systemPath>
         </dependency>
       </dependencies>
     </profile>