Upgrade guava to 20.0

spotify · Jun 12, 2017 · 6d0a4cf · 6d0a4cf
1 parent 6f676a6
commit 6d0a4cf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>18.0</version>
+      <version>20.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>

diff --git a/src/main/java/com/spotify/docker/client/DefaultDockerClient.java b/src/main/java/com/spotify/docker/client/DefaultDockerClient.java
@@ -2528,7 +2528,7 @@ public static Builder fromEnv() throws DockerCertificateException {
     } else {
       final String stripped = endpoint.replaceAll(".*://", "");
       final HostAndPort hostAndPort = HostAndPort.fromString(stripped);
-      final String hostText = hostAndPort.getHostText();
+      final String hostText = hostAndPort.getHost();
       final String scheme = certs.isPresent() ? "https" : "http";
 
       final int port = hostAndPort.getPortOrDefault(DockerHost.defaultPort());

diff --git a/src/main/java/com/spotify/docker/client/DockerHost.java b/src/main/java/com/spotify/docker/client/DockerHost.java
@@ -81,7 +81,7 @@ private DockerHost(final String endpoint, final String certPath) {
     } else {
       final String stripped = endpoint.replaceAll(".*://", "");
       final HostAndPort hostAndPort = HostAndPort.fromString(stripped);
-      final String hostText = hostAndPort.getHostText();
+      final String hostText = hostAndPort.getHost();
       final String scheme = isNullOrEmpty(certPath) ? "http" : "https";
 
       this.port = hostAndPort.getPortOrDefault(defaultPort());