X Tutup
Skip to content

Restore guava as a dependency #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcuslinke merged 1 commit into from
Feb 18, 2015
Merged

Restore guava as a dependency #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pom.xml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
View file
Open in desktop
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
View file
Open in desktop
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/AttachContainerCmdImpl.java
View file
Open in desktop
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/BuildImageCmdImpl.java
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
View file
Open in desktop
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/CreateContainerCmdImpl.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
View file
Open in desktop
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/ExecCreateCmdImpl.java
View file
Open in desktop
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
View file
Open in desktop
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/InspectContainerCmdImpl.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
View file
Open in desktop
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/PauseContainerCmdImpl.java
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/util/guava/PercentEscaper.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/util/guava/UnicodeEscaper.java
View file
Open in desktop
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
View file
Open in desktop
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
Loading
X Tutup