Repository: hive Updated Branches: refs/heads/master 7a04dd626 -> 0edf6b3ff
HIVE-18579 : Changes from HIVE18495 introduced import paths from shaded jars (Ashutosh Chauhan via Zoltan Haindrich) Signed-off-by: Ashutosh Chauhan <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/0edf6b3f Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/0edf6b3f Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/0edf6b3f Branch: refs/heads/master Commit: 0edf6b3ffe9a9ef06e5205cebc510cabb1391eb3 Parents: 7a04dd6 Author: Ashutosh Chauhan <[email protected]> Authored: Mon Jan 29 22:41:56 2018 -0800 Committer: Ashutosh Chauhan <[email protected]> Committed: Mon Jan 29 23:42:51 2018 -0800 ---------------------------------------------------------------------- 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/0edf6b3f/ql/src/test/org/apache/hive/testutils/HiveTestEnvSetup.java ---------------------------------------------------------------------- diff --git a/ql/src/test/org/apache/hive/testutils/HiveTestEnvSetup.java b/ql/src/test/org/apache/hive/testutils/HiveTestEnvSetup.java index 52b787f..cc97317 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.Set; 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; http://git-wip-us.apache.org/repos/asf/hive/blob/0edf6b3f/ql/src/test/org/apache/hive/testutils/MiniZooKeeperCluster.java ---------------------------------------------------------------------- diff --git a/ql/src/test/org/apache/hive/testutils/MiniZooKeeperCluster.java b/ql/src/test/org/apache/hive/testutils/MiniZooKeeperCluster.java index 1067dcf..6e9e6dd 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.NIOServerCnxnFactory; 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
