Use oraclejdk8 for build because oraclejdk7 no longer available (trav…

…is-ci/travis-ci#7884 (comment))
spotify · May 22, 2018 · eb07dfe · eb07dfe
1 parent 16af1b8
commit eb07dfe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ services:
 language: java
 
 jdk:
-  - oraclejdk7
+  - oraclejdk8
 
 env:
   global:

diff --git a/src/main/java/com/spotify/docker/AbstractDockerMojo.java b/src/main/java/com/spotify/docker/AbstractDockerMojo.java
@@ -25,21 +25,21 @@
 
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.common.base.Function;
-import com.spotify.docker.client.shaded.com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.spotify.docker.client.DefaultDockerClient;
 import com.spotify.docker.client.DockerCertificates;
 import com.spotify.docker.client.DockerCertificatesStore;
 import com.spotify.docker.client.DockerClient;
 import com.spotify.docker.client.auth.ConfigFileRegistryAuthSupplier;
-import com.spotify.docker.client.auth.MultiRegistryAuthSupplier;
 import com.spotify.docker.client.auth.FixedRegistryAuthSupplier;
+import com.spotify.docker.client.auth.MultiRegistryAuthSupplier;
 import com.spotify.docker.client.auth.RegistryAuthSupplier;
 import com.spotify.docker.client.auth.gcr.ContainerRegistryAuthSupplier;
 import com.spotify.docker.client.exceptions.DockerCertificateException;
 import com.spotify.docker.client.messages.RegistryAuth;
 import com.spotify.docker.client.messages.RegistryConfigs;
+import com.spotify.docker.client.shaded.com.google.common.base.Optional;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ services: @@
     language: java
     jdk:
-      - oraclejdk7
+      - oraclejdk8
     env:
       global:
@@ Expand Down @@