DRILL-6422: Update guava to 23.0 and shade it

- Fix compilation errors for new version of Guava.
- Remove usage of deprecated API
- Shade guava and add dependencies to the shaded version
- Ban unshaded package
- Introduce drill-shaded module and move guava-shaded under it
- Add methods to convert shaded guava lists to the unshaded ones
- Add instruction for publishing artifacts to the Apache repository

1 files changed, 5 insertions, 3 deletions

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 7c5f5f359..70f2f8161 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,6 @@
  */
 package org.apache.drill.yarn.zk;
 
-import static com.google.common.base.Throwables.propagate;
 import static com.google.common.collect.Collections2.transform;
 
 import java.io.IOException;
@@ -28,6 +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.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.curator.RetryPolicy;
@@ -185,7 +185,8 @@ public class ZKClusterCoordinator extends ClusterCoordinator {
       discovery.registerService(serviceInstance);
       return new ZKRegistrationHandle(serviceInstance.getId(), data);
     } catch (Exception e) {
-      throw propagate(e);
+      Throwables.throwIfUnchecked(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -206,7 +207,8 @@ public class ZKClusterCoordinator extends ClusterCoordinator {
           .name(serviceName).build();
       discovery.unregisterService(serviceInstance);
     } catch (Exception e) {
-      propagate(e);
+      Throwables.throwIfUnchecked(e);
+      throw new RuntimeException(e);
     }
   }