Repoint to shaded, imported jersey.repackaged guava (!)

magnayn · magnayn · commit f18697161e74 · 2015-02-03T13:58:40.000Z
Signed-off-by: Nigel Magnay &lt;nigel.magnay@gmail.com&gt;
diff --git a/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java b/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java
@@ -1,12 +1,14 @@
 package com.github.dockerjava.api.model;
 
-import com.google.common.base.Objects;
+
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.Serializable;
 
+import jersey.repackaged.com.google.common.base.Objects;
+
 /**
  * Represents an event stream
  */
diff --git a/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java b/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java
@@ -1,12 +1,12 @@
 package com.github.dockerjava.api.model;
 
-import com.google.common.base.Objects;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.Serializable;
 
+import jersey.repackaged.com.google.common.base.Objects;
+
 /**
  * Represents an item returned from push
  */
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.jaxrs;
 
-import com.google.common.collect.ImmutableList;
+
 
 import static javax.ws.rs.client.Entity.entity;
 
@@ -24,6 +24,8 @@
 import com.github.dockerjava.api.model.EventStreamItem;
 import com.github.dockerjava.api.model.PushEventStreamItem;
 
+import jersey.repackaged.com.google.common.collect.ImmutableList;
+
 public class BuildImageCmdExec extends AbstrDockerCmdExec<BuildImageCmd, BuildImageCmd.Response> implements BuildImageCmd.Exec {
 	
 	private static final Logger LOGGER = LoggerFactory
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.jaxrs;
 
-import com.google.common.collect.ImmutableList;
+
 
 import static javax.ws.rs.client.Entity.entity;
 
@@ -21,6 +21,8 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PushEventStreamItem;
 
+// Shaded, but imported
+import jersey.repackaged.com.google.common.collect.ImmutableList;
 
 public class PushImageCmdExec extends AbstrDockerCmdExec<PushImageCmd, Response> implements PushImageCmd.Exec {
 	
