Skip to content

Commit 8f9c275

Browse files
flandrflandr
committed
Restore guava as a dependency
The repackaged guava classes provided by Jersey are incomplete and attempting to export these repackaged types will lead to path lookup errors in consumers. Fixes #151
1 parent c17bd5b commit 8f9c275

50 files changed

Lines changed: 64 additions & 57 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<jnr.unixsocket.version>0.3</jnr.unixsocket.version>
6565
<bouncycastle.version>1.51</bouncycastle.version>
6666
<unix-socket-factory.version>2015-01-27T15-02-14</unix-socket-factory.version>
67+
<guava.version>18.0</guava.version>
6768

6869
<!--test dependencies -->
6970
<version.logback>1.1.0</version.logback>
@@ -143,6 +144,12 @@
143144
<version>${slf4j-api.version}</version>
144145
</dependency>
145146

147+
<dependency>
148+
<groupId>com.google.guava</groupId>
149+
<artifactId>guava</artifactId>
150+
<version>${guava.version}</version>
151+
</dependency>
152+
146153
<!-- <dependency> -->
147154
<!-- <groupId>org.slf4j</groupId> -->
148155
<!-- <artifactId>jul-to-slf4j</artifactId> -->

‎src/main/java/com/github/dockerjava/api/model/Device.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.dockerjava.api.model;
22

3-
import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
3+
import static com.google.common.base.Preconditions.checkNotNull;
44

55
import org.apache.commons.lang.builder.EqualsBuilder;
66
import org.apache.commons.lang.builder.HashCodeBuilder;

‎src/main/java/com/github/dockerjava/api/model/EventStreamItem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import java.io.Serializable;
99

10-
import jersey.repackaged.com.google.common.base.Objects;
10+
import com.google.common.base.Objects;
1111

1212
/**
1313
* Represents an event stream

‎src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import java.io.Serializable;
77

8-
import jersey.repackaged.com.google.common.base.Objects;
8+
import com.google.common.base.Objects;
99

1010
/**
1111
* Represents an item returned from push

‎src/main/java/com/github/dockerjava/api/model/RestartPolicy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.dockerjava.api.model;
22

3-
import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
3+
import static com.google.common.base.Preconditions.checkNotNull;
44

55
import org.apache.commons.lang.builder.EqualsBuilder;
66
import org.apache.commons.lang.builder.HashCodeBuilder;

‎src/main/java/com/github/dockerjava/core/DockerClientConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.dockerjava.core;
22

3-
import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
3+
import static com.google.common.base.Preconditions.checkNotNull;
44

55
import java.io.File;
66
import java.io.FileInputStream;

‎src/main/java/com/github/dockerjava/core/DockerClientImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.dockerjava.core;
22

3-
import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
3+
import static com.google.common.base.Preconditions.checkNotNull;
44

55
import java.io.Closeable;
66
import java.io.File;

‎src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.dockerjava.core;
22

3-
import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
3+
import static com.google.common.base.Preconditions.checkNotNull;
44

55
import java.io.File;
66
import java.io.FileInputStream;

‎src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.dockerjava.core;
22

3-
import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
3+
import static com.google.common.base.Preconditions.checkNotNull;
44

55
import java.io.Serializable;
66
import java.security.Security;

‎src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.dockerjava.core.command;
22

3-
import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
3+
import static com.google.common.base.Preconditions.checkNotNull;
44

55
import java.io.IOException;
66

0 commit comments

Comments
 (0)