From 900a5f09df501a4cdaf34156afd1fd9199fa3c3f Mon Sep 17 00:00:00 2001
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Mon, 11 May 2015 16:08:11 -0700
Subject: [PATCH] HBASE-13637 branch-1.1 does not build against hadoop-2.2.
 (zhangduo and ndimiduk)

---
 .../hbase/security/token/TestGenerateDelegationToken.java     | 2 +-
 pom.xml                                                       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestGenerateDelegationToken.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestGenerateDelegationToken.java
index afe51d7a244..74a1754c616 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestGenerateDelegationToken.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestGenerateDelegationToken.java
@@ -89,7 +89,7 @@ public class TestGenerateDelegationToken {
     conf.set(DFSConfigKeys.DFS_WEB_AUTHENTICATION_KERBEROS_PRINCIPAL_KEY, HTTP_PRINCIPAL + "@"
         + KDC.getRealm());
     conf.setBoolean(DFSConfigKeys.DFS_BLOCK_ACCESS_TOKEN_ENABLE_KEY, true);
-    conf.set(DFSConfigKeys.DFS_HTTP_POLICY_KEY, HttpConfig.Policy.HTTPS_ONLY.name());
+    conf.set("dfs.http.policy", HttpConfig.Policy.HTTPS_ONLY.name());
     conf.set(DFSConfigKeys.DFS_NAMENODE_HTTPS_ADDRESS_KEY, "localhost:0");
     conf.set(DFSConfigKeys.DFS_DATANODE_HTTPS_ADDRESS_KEY, "localhost:0");
 
diff --git a/pom.xml b/pom.xml
index 72419eb39ef..f8b5c035a39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1113,6 +1113,8 @@
     <java.min.version>${compileSource}</java.min.version>
     <!-- Dependencies -->
     <hadoop-two.version>2.5.1</hadoop-two.version>
+    <!-- minikdc introduced in hadoop-2.3; override when building earlier versions -->
+    <hadoop-two-minikdc.version>${hadoop-two.version}</hadoop-two-minikdc.version>
     <hadoop-three.version>3.0.0-SNAPSHOT</hadoop-three.version>
     <commons-cli.version>1.2</commons-cli.version>
     <commons-codec.version>1.9</commons-codec.version>
@@ -1983,7 +1985,7 @@
           <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-minikdc</artifactId>
-            <version>${hadoop-two.version}</version>
+            <version>${hadoop-two-minikdc.version}</version>
             <scope>test</scope>
           </dependency>
         </dependencies>