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 wh...@apache.org on 2014/11/05 03:01:04 UTC

git commit: HADOOP-11269. Add java 8 profile for hadoop-annotations. Contributed by Li Lu.

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 fa92b40f0 -> ab07fef5b


HADOOP-11269. Add java 8 profile for hadoop-annotations. Contributed by Li Lu.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ab07fef5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ab07fef5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ab07fef5

Branch: refs/heads/branch-2
Commit: ab07fef5b79d53e19cc9900a93a93103d5101879
Parents: fa92b40
Author: Haohui Mai <wh...@apache.org>
Authored: Tue Nov 4 17:57:31 2014 -0800
Committer: Haohui Mai <wh...@apache.org>
Committed: Tue Nov 4 18:01:02 2014 -0800

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ab07fef5/hadoop-common-project/hadoop-annotations/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml
index fc8d4c9..fc7038b 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>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ab07fef5/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index c20a6cb..0c1e746 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -52,6 +52,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