Restore guava as a dependency by flandr · Pull Request #152

Restore guava as a dependency by flandr · Pull Request #152 · docker-java/docker-java

7 changes: 7 additions & 0 deletions pom.xml

Original file line number	Diff line number	Diff line change
Expand Up		@@ -64,6 +64,7 @@
		<jnr.unixsocket.version>0.3</jnr.unixsocket.version>
		<bouncycastle.version>1.51</bouncycastle.version>
		<unix-socket-factory.version>2015-01-27T15-02-14</unix-socket-factory.version>
		<guava.version>18.0</guava.version>

		<!--test dependencies -->
		<version.logback>1.1.0</version.logback>
Expand Down Expand Up		@@ -143,6 +144,12 @@
		<version>${slf4j-api.version}</version>
		</dependency>

		<dependency>
		<groupId>com.google.guava</groupId>
		<artifactId>guava</artifactId>
		<version>${guava.version}</version>
		</dependency>

		<!-- <dependency> -->
		<!-- <groupId>org.slf4j</groupId> -->
		<!-- <artifactId>jul-to-slf4j</artifactId> -->
Expand Down

2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/model/Device.java

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.api.model;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import org.apache.commons.lang.builder.EqualsBuilder;
		import org.apache.commons.lang.builder.HashCodeBuilder;
Expand Down

2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/model/EventStreamItem.java

Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,7 +7,7 @@

		import java.io.Serializable;

		import jersey.repackaged.com.google.common.base.Objects;
		import com.google.common.base.Objects;

		/**
		* Represents an event stream
Expand Down

2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java

Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,7 +5,7 @@

		import java.io.Serializable;

		import jersey.repackaged.com.google.common.base.Objects;
		import com.google.common.base.Objects;

		/**
		* Represents an item returned from push
Expand Down

2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/api/model/RestartPolicy.java

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.api.model;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import org.apache.commons.lang.builder.EqualsBuilder;
		import org.apache.commons.lang.builder.HashCodeBuilder;
Expand Down

2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/DockerClientConfig.java

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.io.File;
		import java.io.FileInputStream;
Expand Down

2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/DockerClientImpl.java

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.io.Closeable;
		import java.io.File;
Expand Down

2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.io.File;
		import java.io.FileInputStream;
Expand Down

2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.io.Serializable;
		import java.security.Security;
Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.io.IOException;

Expand Down

2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.io.IOException;

Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.io.InputStream;

Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,7 +26,7 @@
		import com.github.dockerjava.core.GoLangMatchFileFilter;
		import com.github.dockerjava.core.dockerfile.Dockerfile;

		import static jersey.repackaged.com.google.common.base.Preconditions.*;
		import static com.google.common.base.Preconditions.*;

		/**
		*
Expand Down

2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import org.apache.commons.lang.builder.ToStringBuilder;

Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.util.List;

Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.io.InputStream;

Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import org.apache.commons.lang.builder.ToStringBuilder;

Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.io.InputStream;

Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import com.fasterxml.jackson.annotation.JsonProperty;
		import com.github.dockerjava.api.NotFoundException;
Expand Down

2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.io.InputStream;

Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import com.github.dockerjava.api.NotFoundException;
		import com.github.dockerjava.api.command.InspectContainerCmd;
Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import com.github.dockerjava.api.NotFoundException;
		import com.github.dockerjava.api.command.InspectImageCmd;
Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import com.github.dockerjava.api.NotFoundException;
		import com.github.dockerjava.api.command.KillContainerCmd;
Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,7 +1,7 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkArgument;
		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkArgument;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.util.List;

Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.util.List;

Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.io.InputStream;

Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import com.github.dockerjava.api.NotFoundException;
		import com.github.dockerjava.api.command.PauseContainerCmd;
Expand Down

2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.io.InputStream;

Expand Down

2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import com.github.dockerjava.api.NotFoundException;
		import com.github.dockerjava.api.command.PushImageCmd;
Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import com.github.dockerjava.api.NotFoundException;
		import com.github.dockerjava.api.command.RemoveContainerCmd;
Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import com.github.dockerjava.api.NotFoundException;
		import com.github.dockerjava.api.command.RemoveImageCmd;
Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,7 +1,7 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkArgument;
		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkArgument;
		import static com.google.common.base.Preconditions.checkNotNull;

		import com.github.dockerjava.api.NotFoundException;
		import com.github.dockerjava.api.command.RestartContainerCmd;
Expand Down

2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java

Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,7 +5,7 @@

		import java.io.InputStream;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		public class SaveImageCmdImpl extends AbstrAuthCfgDockerCmd<SaveImageCmd, InputStream> implements SaveImageCmd {
		private String name;
Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.util.List;

Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,7 +1,7 @@
		package com.github.dockerjava.core.command;

		import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_EMPTY;
		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import org.apache.commons.lang.builder.ToStringBuilder;

Expand Down

4 changes: 2 additions & 2 deletions src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java

Original file line number	Diff line number	Diff line change
		@@ -1,7 +1,7 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkArgument;
		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkArgument;
		import static com.google.common.base.Preconditions.checkNotNull;

		import com.github.dockerjava.api.NotFoundException;
		import com.github.dockerjava.api.NotModifiedException;
Expand Down

2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import com.github.dockerjava.api.command.TagImageCmd;

Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import com.github.dockerjava.api.NotFoundException;
		import com.github.dockerjava.api.command.TopContainerCmd;
Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import com.github.dockerjava.api.NotFoundException;
		import com.github.dockerjava.api.command.UnpauseContainerCmd;
Expand Down

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.core.command;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import com.github.dockerjava.api.command.WaitContainerCmd;

Expand Down

10 changes: 5 additions & 5 deletions src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java

Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,11 +20,11 @@
		import java.util.Map;
		import java.util.UUID;

		import jersey.repackaged.com.google.common.base.Function;
		import jersey.repackaged.com.google.common.base.Objects;
		import jersey.repackaged.com.google.common.base.Optional;
		import jersey.repackaged.com.google.common.base.Predicate;
		import jersey.repackaged.com.google.common.collect.Collections2;
		import com.google.common.base.Function;
		import com.google.common.base.Objects;
		import com.google.common.base.Optional;
		import com.google.common.base.Predicate;
		import com.google.common.collect.Collections2;

		/**
		* Parse a Dockerfile.
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,8 +8,8 @@
		import java.util.regex.Matcher;
		import java.util.regex.Pattern;

		import jersey.repackaged.com.google.common.base.Objects;
		import jersey.repackaged.com.google.common.base.Optional;
		import com.google.common.base.Objects;
		import com.google.common.base.Optional;

		/**
		* A statement present in a dockerfile.
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,7 +16,7 @@

		package com.github.dockerjava.core.util.guava;

		import jersey.repackaged.com.google.common.base.Preconditions;
		import com.google.common.base.Preconditions;

		/**
		* A {@code UnicodeEscaper} that escapes some set of Java characters using a
Expand Down

Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,7 +16,7 @@

		package com.github.dockerjava.core.util.guava;

		import jersey.repackaged.com.google.common.base.Preconditions;
		import com.google.common.base.Preconditions;


		/**
Expand Down

2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java

Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		package com.github.dockerjava.jaxrs;

		import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
		import static com.google.common.base.Preconditions.checkNotNull;

		import java.io.IOException;

Expand Down