From 3b6b73d9a17527ecdc04a6cac968e89bc45b74af Mon Sep 17 00:00:00 2001
From: Ignasi Barrera <nacx@apache.org>
Date: Wed, 10 Jun 2015 13:00:33 +0200
Subject: [PATCH] Do not use AutoValue shaded imports

---
 .../compute/GoogleComputeEngineService.java                  | 5 ++---
 .../googlecomputeengine/compute/predicates/GroupIsEmpty.java | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java
index 1dc337c462..74c7c5711f 100644
--- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java
+++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java
@@ -16,8 +16,8 @@
  */
 package org.jclouds.googlecomputeengine.compute;
 
-import static autovalue.shaded.com.google.common.common.collect.Sets.newHashSet;
 import static com.google.common.collect.Iterables.filter;
+import static com.google.common.collect.Sets.newHashSet;
 import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_RUNNING;
 import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_SUSPENDED;
 import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_TERMINATED;
@@ -65,12 +65,11 @@ import org.jclouds.googlecomputeengine.domain.Operation;
 import org.jclouds.googlecomputeengine.features.FirewallApi;
 import org.jclouds.scriptbuilder.functions.InitAdminAccess;
 
-import autovalue.shaded.com.google.common.common.collect.ImmutableSet;
-
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.base.Supplier;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.Atomics;
 import com.google.common.util.concurrent.ListeningExecutorService;
 
diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/GroupIsEmpty.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/GroupIsEmpty.java
index d80e8883e9..3b5c09370e 100644
--- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/GroupIsEmpty.java
+++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/GroupIsEmpty.java
@@ -16,7 +16,7 @@
  */
 package org.jclouds.googlecomputeengine.compute.predicates;
 
-import static autovalue.shaded.com.google.common.common.collect.Iterables.isEmpty;
+import static com.google.common.collect.Iterables.isEmpty;
 import static com.google.common.collect.Sets.filter;
 import static org.jclouds.compute.predicates.NodePredicates.all;
 import static org.jclouds.compute.predicates.NodePredicates.inGroup;