From f9e95b6692634f43ffb46174ef09be7b3db2682b Mon Sep 17 00:00:00 2001 From: Ashutosh Chauhan Date: Mon, 29 Jan 2018 22:41:56 -0800 Subject: [PATCH] HIVE-18579 : Changes from HIVE-18495 introduced import paths from shaded jars --- ql/src/test/org/apache/hive/testutils/HiveTestEnvSetup.java | 2 +- ql/src/test/org/apache/hive/testutils/MiniZooKeeperCluster.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ql/src/test/org/apache/hive/testutils/HiveTestEnvSetup.java b/ql/src/test/org/apache/hive/testutils/HiveTestEnvSetup.java index 52b787f214..cc97317f55 100644 --- a/ql/src/test/org/apache/hive/testutils/HiveTestEnvSetup.java +++ b/ql/src/test/org/apache/hive/testutils/HiveTestEnvSetup.java @@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.io.FileUtils; -import org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.ql.IDriver; diff --git a/ql/src/test/org/apache/hive/testutils/MiniZooKeeperCluster.java b/ql/src/test/org/apache/hive/testutils/MiniZooKeeperCluster.java index 1067dcf8bf..6e9e6dd7a1 100644 --- a/ql/src/test/org/apache/hive/testutils/MiniZooKeeperCluster.java +++ b/ql/src/test/org/apache/hive/testutils/MiniZooKeeperCluster.java @@ -40,7 +40,7 @@ import org.apache.zookeeper.server.ZooKeeperServer; import org.apache.zookeeper.server.persistence.FileTxnLog; -import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; +import com.google.common.annotations.VisibleForTesting; /** * TODO: Most of the code in this class is ripped from ZooKeeper tests. Instead -- 2.14.3 (Apple Git-98)