Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -c 1296861 from trunk to branch-0.23 to fix HADOOP-8123. Use java.home rather than env.JAVA_HOME for java in the project. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296862 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2012-03-04 19:38:09 +00:00
parent 83e260f273
commit 700aee6745
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -169,6 +169,9 @@ Release 0.23.2 - UNRELEASED
HADOOP-8131. FsShell put doesn't correctly handle a non-existent dir HADOOP-8131. FsShell put doesn't correctly handle a non-existent dir
(Daryn Sharp via bobby) (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 Release 0.23.1 - 2012-02-17
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-project/pom.xml
View File

@ -889,7 +889,7 @@
<artifactId>jdk.tools</artifactId> <artifactId>jdk.tools</artifactId>
<version>1.6</version> <version>1.6</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath> <systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>