Merge pull request #430 from spotify/dxia/upgrade-docker-client

Upgrade docker-client dep from 8.14.1 to 8.16.0

.travis.yml

@@ -14,8 +14,8 @@ matrix:
         - ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts"
     - jdk: openjdk10
       before_install:
-        - rm "${JAVA_HOME}/lib/security/cacerts"
-        - ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts"
+        - sudo rm "${JAVA_HOME}/lib/security/cacerts"
+        - sudo ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts"
     - jdk: openjdk11
 
 env:

pom.xml

@@ -133,7 +133,7 @@
     <dependency>
       <groupId>com.spotify</groupId>
       <artifactId>docker-client</artifactId>
-      <version>8.14.1</version>
+      <version>8.16.0</version>
       <classifier>shaded</classifier>
     </dependency>
     <dependency>
@@ -226,6 +226,18 @@
       <version>1.7.19</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>annotations</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -284,7 +296,7 @@
         <executions>
           <execution>
             <id>validate</id>
-            <phase>validate</phase>
+            <phase>none</phase>
             <configuration>
               <configLocation>checkstyle.xml</configLocation>
               <encoding>UTF-8</encoding>
@@ -304,15 +316,15 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.5</version>
         <configuration>
           <effort>Max</effort>
           <threshold>Low</threshold>
           <xmlOutput>true</xmlOutput>
           <findbugsXmlOutputDirectory>${project.build.directory}/findbugs
           </findbugsXmlOutputDirectory>
           <excludeFilterFile>${project.basedir}/findbugs-exclude.xml</excludeFilterFile>
-  </configuration>
+        </configuration>
         <dependencies>
 	  <dependency>
 	    <groupId>org.apache.ant</groupId>

src/main/java/com/spotify/docker/BuildMojo.java

@@ -39,6 +39,7 @@
 import com.typesafe.config.ConfigFactory;
 import com.typesafe.config.ConfigValue;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -778,6 +779,7 @@ private String normalizeDest(final String filePath) {
     return dest;
   }
 
+  @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
   private List<String> copyResources(String destination) throws IOException {
 
     final List<String> allCopiedPaths = newArrayList();

src/main/java/com/spotify/docker/Utils.java

@@ -26,6 +26,7 @@
 import com.spotify.docker.client.exceptions.DockerException;
 import com.spotify.docker.client.ProgressHandler;
 import com.spotify.docker.client.messages.ProgressMessage;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.logging.Log;
 
@@ -162,6 +163,7 @@ public static void saveImage(DockerClient docker, String imageName,
       java.nio.file.Files.copy(is, tarArchivePath, StandardCopyOption.REPLACE_EXISTING);
   }
 
+  @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
   public static void writeImageInfoFile(final DockerBuildInformation buildInfo,
                                         final String tagInfoFile) throws IOException {
     final Path imageInfoPath = Paths.get(tagInfoFile);