This is an automated email from the ASF dual-hosted git repository. tdsilva pushed a commit to branch 4.x-HBase-1.5 in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.5 by this push: new 1e284e4 PHOENIX-5275: Remove accidental imports from curator-client-2.12.0 1e284e4 is described below commit 1e284e43128a31d26ab44ddffa7efb553aad9246 Author: William Shen <wills...@users.noreply.github.com> AuthorDate: Tue Jul 16 10:36:41 2019 -0700 PHOENIX-5275: Remove accidental imports from curator-client-2.12.0 --- phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java | 2 +- .../src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java | 2 +- .../src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java index 3f9948b..98ea0fc 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java @@ -41,7 +41,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import com.google.common.collect.Lists; -import org.apache.curator.shaded.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.snapshot.SnapshotCreationException; import org.apache.hadoop.hbase.util.Bytes; diff --git a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java index f2d5cfe..f3a8fa1 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java @@ -50,7 +50,7 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; -import org.apache.curator.shaded.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java index df9d843..8bef7c9 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java @@ -20,11 +20,10 @@ package org.apache.phoenix.query; import static org.apache.phoenix.query.QueryServicesOptions.DEFAULT_SPOOL_DIRECTORY; import static org.apache.phoenix.query.QueryServicesOptions.withDefaults; -import org.apache.curator.shaded.com.google.common.io.Files; +import com.google.common.io.Files; import org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.ReadOnlyProps; -import org.apache.phoenix.util.TestUtil; import org.apache.tephra.TxConstants;