From f6f20616c6656fa56d7065094100e3ab0e899b8f Mon Sep 17 00:00:00 2001
From: Andrew Wang <wang@apache.org>
Date: Thu, 12 May 2016 23:58:18 -0700
Subject: [PATCH] HADOOP-12868. Fix hadoop-openstack undeclared and unused
 dependencies. Contributed by Masatake Iwasaki.

(cherry picked from commit fa440a39b7883183b9cf43c056908ca7bf68e6a1)
---
 hadoop-tools/hadoop-openstack/pom.xml | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/hadoop-tools/hadoop-openstack/pom.xml b/hadoop-tools/hadoop-openstack/pom.xml
index ea2e75d0f9a..33542faf641 100644
--- a/hadoop-tools/hadoop-openstack/pom.xml
+++ b/hadoop-tools/hadoop-openstack/pom.xml
@@ -94,13 +94,17 @@
       <artifactId>hadoop-common</artifactId>
       <scope>compile</scope>
     </dependency>
-
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
       <scope>compile</scope>
       <type>test-jar</type>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-annotations</artifactId>
+      <scope>compile</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
@@ -117,11 +121,9 @@
       <artifactId>commons-httpclient</artifactId>
       <scope>compile</scope>
     </dependency>
-
-    <!-- Used for loading test resources and converting a File to byte[] -->
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <scope>compile</scope>
     </dependency>
 
@@ -130,15 +132,5 @@
       <artifactId>junit</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>