Skip to content
This repository has been archived by the owner on Mar 21, 2022. It is now read-only.

Upgrade guava to 20.0 #792

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Not yet released
- Add Event types: plugin, node, service, and secret ([825][])
- Add Event filters: plugin and scope ([825][])
- Small fixes to code and tests for docker 17.06.0 ([825][])
- Upgrade Google Guava to 20.0 ([792][])

[825]: https://github.com/spotify/docker-client/pull/825

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2613,7 +2613,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());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/spotify/docker/client/DockerHost.java
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down