HBASE-13637 branch-1.1 does not build against hadoop-2.2. (zhangduo and ndimiduk)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5deb8780 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5deb8780 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5deb8780 Branch: refs/heads/branch-1.1.0 Commit: 5deb8780fa5892ce6b48cd6247cc7051d0216363 Parents: d6ac86c Author: Nick Dimiduk <[email protected]> Authored: Mon May 11 16:08:11 2015 -0700 Committer: Nick Dimiduk <[email protected]> Committed: Mon May 11 16:12:33 2015 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/security/token/TestGenerateDelegationToken.java | 2 +- pom.xml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/5deb8780/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestGenerateDelegationToken.java ---------------------------------------------------------------------- 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"); http://git-wip-us.apache.org/repos/asf/hbase/blob/5deb8780/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0c62866..3be32b6 100644 --- a/pom.xml +++ b/pom.xml @@ -1115,6 +1115,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> @@ -1985,7 +1987,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>
