From 7fd5b56a8b39a1cbd1663efb96285c52245e64b8 Mon Sep 17 00:00:00 2001
From: Thomas Graves <tgraves@apache.org>
Date: Tue, 31 Jul 2012 20:44:12 +0000
Subject: [PATCH] merge -r 1367763:1367764 from trunk. FIXES: HADOOP-8370

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367765 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-common-project/hadoop-common/CHANGES.txt | 4 ++++
 hadoop-common-project/hadoop-common/pom.xml     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 7ef995c49ff..e0b18a898f2 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -688,6 +688,10 @@ Release 0.23.3 - UNRELEASED
 
     HADOOP-8637. FilterFileSystem#setWriteChecksum is broken (daryn via bobby)
 
+    HADOOP-8370. Native build failure: javah: class file for 
+    org.apache.hadoop.classification.InterfaceAudience not found  (Trevor
+    Robinson via tgraves)
+
 Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 1841e4f3660..9e7f7df3f24 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-annotations</artifactId>
-      <scope>provided</scope>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>