You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2015/06/10 13:00:41 UTC
jclouds-labs-google git commit: Do not use AutoValue shaded imports
Repository: jclouds-labs-google
Updated Branches:
refs/heads/master 88201e442 -> a3132c4a8
Do not use AutoValue shaded imports
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/a3132c4a
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/a3132c4a
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/a3132c4a
Branch: refs/heads/master
Commit: a3132c4a89b80f10dc483cb9d8c794c46f60cccb
Parents: 88201e4
Author: Ignasi Barrera <na...@apache.org>
Authored: Wed Jun 10 13:00:33 2015 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Wed Jun 10 13:00:33 2015 +0200
----------------------------------------------------------------------
.../googlecomputeengine/compute/GoogleComputeEngineService.java | 5 ++---
.../googlecomputeengine/compute/predicates/GroupIsEmpty.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/a3132c4a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java
index 1dc337c..74c7c57 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java
+++ b/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;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/a3132c4a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/GroupIsEmpty.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/GroupIsEmpty.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/GroupIsEmpty.java
index d80e888..3b5c093 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/GroupIsEmpty.java
+++ b/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;