From 4e1c6750fd8be2d8c3acee1b11bcf59c450c1afa Mon Sep 17 00:00:00 2001 From: Luke Cwik Date: Wed, 22 Nov 2017 10:50:43 -0800 Subject: [PATCH] Fix test runtime class conflicts and get hbase tests passing. --- sdks/java/io/hbase/build.gradle | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sdks/java/io/hbase/build.gradle b/sdks/java/io/hbase/build.gradle index bcfebbd1cff75..dbfceb06fd933 100644 --- a/sdks/java/io/hbase/build.gradle +++ b/sdks/java/io/hbase/build.gradle @@ -29,13 +29,6 @@ test { } } -test { - // TODO: Get tests to run. Known issues: - // * hbase-server:tests conflict with hbase-shaded-server with ProtobufUtil - ignoreFailures true -} - - def hbase_version = "1.2.6" dependencies { @@ -54,7 +47,16 @@ dependencies { testCompile library.java.hadoop_hdfs testCompile library.java.hadoop_common testCompile "org.apache.hbase:hbase-shaded-server:$hbase_version" - testCompile "org.apache.hbase:hbase-server:$hbase_version:tests" + testCompile("org.apache.hbase:hbase-server:$hbase_version:tests") { + // We prevent bringing in unshaded dependencies to not conflict + // with hbase-shaded-server and hbase-shaded-client + transitive = false + } + testCompile("org.apache.hbase:hbase-common:$hbase_version:tests") { + // We prevent bringing in unshaded dependencies to not conflict + // with hbase-shaded-server and hbase-shaded-client + transitive = false + } testCompile "org.apache.hbase:hbase-hadoop-compat:$hbase_version:tests" testCompile "org.apache.hbase:hbase-hadoop2-compat:$hbase_version:tests" }