From 0762b4a3fbb8820d38b3c0d1adc0261a156433aa Mon Sep 17 00:00:00 2001
From: Haohui Mai <wheat9@apache.org>
Date: Tue, 4 Nov 2014 17:57:31 -0800
Subject: [PATCH] HADOOP-11269. Add java 8 profile for hadoop-annotations.
 Contributed by Li Lu.

---
 hadoop-common-project/hadoop-annotations/pom.xml | 15 +++++++++++++++
 hadoop-common-project/hadoop-common/CHANGES.txt  |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/hadoop-common-project/hadoop-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml
index 4428cacd29..84a106e665 100644
--- a/hadoop-common-project/hadoop-annotations/pom.xml
+++ b/hadoop-common-project/hadoop-annotations/pom.xml
@@ -71,6 +71,21 @@
         </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <id>jdk1.8</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>jdk.tools</groupId>
+          <artifactId>jdk.tools</artifactId>
+          <version>1.8</version>
+          <scope>system</scope>
+          <systemPath>${java.home}/../lib/tools.jar</systemPath>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 
 </project>
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 8195ef8f2c..78272700e2 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -395,6 +395,8 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11230. Add missing dependency of bouncycastle for kms, httpfs, hdfs, MR
     and YARN. (Robert Kanter via wheat9)
 
+    HADOOP-11269. Add java 8 profile for hadoop-annotations. (Li Lu via wheat9)
+
 Release 2.6.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES