Author: stevel Date: Fri Sep 13 11:04:16 2013 New Revision: 1522867 URL: http://svn.apache.org/r1522867 Log: HADOOP-9350. Hadoop not building against Java7 on OSX
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-annotations/pom.xml hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-annotations/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-annotations/pom.xml?rev=1522867&r1=1522866&r2=1522867&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-annotations/pom.xml (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-annotations/pom.xml Fri Sep 13 11:04:16 2013 @@ -56,6 +56,21 @@ </dependency> </dependencies> </profile> + <profile> + <id>jdk1.7</id> + <activation> + <jdk>1.7</jdk> + </activation> + <dependencies> + <dependency> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + <version>1.7</version> + <scope>system</scope> + <systemPath>${java.home}/../lib/tools.jar</systemPath> + </dependency> + </dependencies> + </profile> </profiles> </project> Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1522867&r1=1522866&r2=1522867&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Sep 13 11:04:16 2013 @@ -363,6 +363,9 @@ Release 2.3.0 - UNRELEASED HADOOP-9908. Fix NPE when versioninfo properties file is missing (todd) + HADOOP-9350. Hadoop not building against Java7 on OSX + (Robert Kanter via stevel) + Release 2.1.1-beta - UNRELEASED INCOMPATIBLE CHANGES