diff options
| author | Volodymyr Vysotskyi <vvovyk@gmail.com> | 2018-08-27 19:22:46 +0300 |
|---|---|---|
| committer | Volodymyr Vysotskyi <vvovyk@gmail.com> | 2018-08-28 20:04:25 +0300 |
| commit | 8edeb49873d1a1710cfe28e0b49364d07eb1aef4 (patch) | |
| tree | 5f61dc12ba61a223d4f25afadc39abc427113662 /drill-yarn/src/main/java/org/apache | |
| parent | 44e63bd0deda72af726f51e0ff78fc2b636c64eb (diff) | |
DRILL-6422: Replace guava imports with shaded ones
Diffstat (limited to 'drill-yarn/src/main/java/org/apache')
3 files changed, 5 insertions, 5 deletions
diff --git a/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/WebServer.java b/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/WebServer.java index aeeafdefc..0920eb6a4 100644 --- a/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/WebServer.java +++ b/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/WebServer.java @@ -75,7 +75,7 @@ import org.eclipse.jetty.util.ssl.SslContextFactory; import org.glassfish.jersey.servlet.ServletContainer; import org.joda.time.DateTime; -import com.google.common.collect.ImmutableSet; +import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; import com.typesafe.config.Config; /** diff --git a/drill-yarn/src/main/java/org/apache/drill/yarn/zk/ZKClusterCoordinator.java b/drill-yarn/src/main/java/org/apache/drill/yarn/zk/ZKClusterCoordinator.java index 70f2f8161..e79831278 100644 --- a/drill-yarn/src/main/java/org/apache/drill/yarn/zk/ZKClusterCoordinator.java +++ b/drill-yarn/src/main/java/org/apache/drill/yarn/zk/ZKClusterCoordinator.java @@ -17,7 +17,7 @@ */ package org.apache.drill.yarn.zk; -import static com.google.common.collect.Collections2.transform; +import static org.apache.drill.shaded.guava.com.google.common.collect.Collections2.transform; import java.io.IOException; import java.util.Collection; @@ -27,7 +27,7 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import com.google.common.base.Throwables; +import org.apache.drill.shaded.guava.com.google.common.base.Throwables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.curator.RetryPolicy; @@ -56,7 +56,7 @@ import org.apache.drill.exec.coord.zk.ZkTransientStoreFactory; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.State; -import com.google.common.base.Function; +import org.apache.drill.shaded.guava.com.google.common.base.Function; /** * Manages cluster coordination utilizing zookeeper. diff --git a/drill-yarn/src/main/java/org/apache/drill/yarn/zk/ZKRegistry.java b/drill-yarn/src/main/java/org/apache/drill/yarn/zk/ZKRegistry.java index d05c5628b..d20c40eb4 100644 --- a/drill-yarn/src/main/java/org/apache/drill/yarn/zk/ZKRegistry.java +++ b/drill-yarn/src/main/java/org/apache/drill/yarn/zk/ZKRegistry.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.google.common.annotations.VisibleForTesting; +import org.apache.drill.shaded.guava.com.google.common.annotations.VisibleForTesting; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; |