From 525d80467076af30795646452b40d94dca6976c2 Mon Sep 17 00:00:00 2001 From: zhangduo Date: Thu, 7 May 2015 08:46:53 +0800 Subject: [PATCH] HBASE-13637 branch-1.1 does not build against hadoop-2.2. --- .../hadoop/hbase/security/token/TestGenerateDelegationToken.java | 2 +- pom.xml | 3 ++- 2 files changed, 3 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 afe51d7..74a1754 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 add282f..b25a441 100644 --- a/pom.xml +++ b/pom.xml @@ -1064,6 +1064,7 @@ ${compileSource} 2.5.1 + 2.5.1 3.0.0-SNAPSHOT 1.2 1.9 @@ -1934,7 +1935,7 @@ org.apache.hadoop hadoop-minikdc - ${hadoop-two.version} + ${hadoop-two-minikdc.version} test -- 1.9.1