You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2013/09/14 10:01:03 UTC

svn commit: r1523190 - in /hadoop/common/branches/branch-2.1-beta/hadoop-common-project: hadoop-annotations/pom.xml hadoop-common/CHANGES.txt

Author: stevel
Date: Sat Sep 14 08:01:03 2013
New Revision: 1523190

URL: http://svn.apache.org/r1523190
Log:
HADOOP-9350. Hadoop not building against Java7 on OSX: now applied across branch-2.1, 2 and trunk

Modified:
    hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-annotations/pom.xml
    hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-annotations/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-annotations/pom.xml?rev=1523190&r1=1523189&r2=1523190&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-annotations/pom.xml (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-annotations/pom.xml Sat Sep 14 08:01:03 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/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1523190&r1=1523189&r2=1523190&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Sat Sep 14 08:01:03 2013
@@ -114,6 +114,9 @@ Release 2.1.1-beta - UNRELEASED
     HADOOP-9557. hadoop-client excludes commons-httpclient. (Lohit Vijayarenu via
     cnauroth)
 
+    HADOOP-9350. Hadoop not building against Java7 on OSX
+    (Robert Kanter via stevel)
+
 Release 2.1.0-beta - 2013-08-22
 
   INCOMPATIBLE CHANGES