update dependencies

fabric8io · Aug 24, 2017 · 674e80f · 674e80f
1 parent e50a7a5
commit 674e80f
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 58 deletions.
diff --git a/doc/changelog.md b/doc/changelog.md
@@ -11,6 +11,7 @@
   - Fix "useAllReactorProjects" in assembly (#812)
   - Add ECDSA support (#824)
   - Fix test failures when build under Windows (#834)
+  - Update dependencies to latest versions where possible
 
 * **0.21.0** (2017-05-16)
   - Add wait checker for checking the exit code of a container ([#498](https://github.com/fabric8io/docker-maven-plugin/issues/498))

diff --git a/pom.xml b/pom.xml
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.4</version>
+      <version>3.5</version>
       <scope>provided</scope>
     </dependency>
 
@@ -100,7 +100,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>4.5.2</version>
+      <version>4.5.3</version>
     </dependency>
 
     <dependency>
@@ -112,7 +112,13 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.4</version>
+      <version>3.6</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+      <version>1.1</version>
     </dependency>
 
     <dependency>
@@ -124,13 +130,13 @@
     <dependency>
       <groupId>org.fusesource.jansi</groupId>
       <artifactId>jansi</artifactId>
-      <version>1.11</version>
+      <version>1.16</version>
     </dependency>
 
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.54</version>
+      <version>1.57</version>
     </dependency>
 
     <dependency>
@@ -153,25 +159,25 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.9.4</version>
+      <version>2.9.9</version>
     </dependency>
 
     <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>
-      <version>1.17</version>
+      <version>1.18</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>19.0</version>
+      <version>23.0-android</version>
     </dependency>
 
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-interpolation</artifactId>
-      <version>1.22</version>
+      <version>1.24</version>
     </dependency>
 
 
@@ -187,7 +193,7 @@
     <dependency>
       <groupId>org.jmockit</groupId>
       <artifactId>jmockit</artifactId>
-      <version>1.29</version>
+      <version>1.33</version>
       <scope>test</scope>
     </dependency>
 
@@ -201,14 +207,14 @@
     <dependency>
       <groupId>org.skyscreamer</groupId>
       <artifactId>jsonassert</artifactId>
-      <version>1.3.0</version>
+      <version>1.5.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>pl.pragmatists</groupId>
       <artifactId>JUnitParams</artifactId>
-      <version>1.0.5</version>
+      <version>1.1.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -225,7 +231,7 @@
 
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.6.2</version>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
@@ -237,7 +243,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.4</version>
+        <version>3.5</version>
         <configuration>
           <goalPrefix>docker</goalPrefix>
           <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
@@ -261,7 +267,7 @@
 
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.2</version>
         <executions>
           <execution>
             <id>copy-plexus-resources</id>
@@ -301,7 +307,7 @@
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-metadata</artifactId>
-        <version>1.6</version>
+        <version>1.7.1</version>
         <configuration>
           <staticMetadataDirectory>${basedir}/target/filtered-resources/META-INF/plexus</staticMetadataDirectory>
         </configuration>
@@ -325,7 +331,7 @@
 
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.0.2</version>
           <configuration>
             <archive>
               <addMavenDescriptor>true</addMavenDescriptor>
@@ -347,18 +353,18 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.3</version>
+          <version>2.10.4</version>
         </plugin>
 
         <plugin>
           <groupId>org.asciidoctor</groupId>
           <artifactId>asciidoctor-maven-plugin</artifactId>
-          <version>1.5.3</version>
+          <version>1.5.5</version>
           <dependencies>
             <dependency>
               <groupId>org.asciidoctor</groupId>
               <artifactId>asciidoctorj</artifactId>
-              <version>1.5.4</version>
+              <version>1.5.6</version>
             </dependency>
           </dependencies>
           <configuration>
@@ -478,7 +484,7 @@
       <id>jacoco</id>
 
       <properties>
-        <jacoco.version>0.7.8</jacoco.version>
+        <jacoco.version>0.7.9</jacoco.version>
       </properties>
 
       <dependencies>

diff --git a/samples/data-jolokia/pom.xml b/samples/data-jolokia/pom.xml
@@ -36,7 +36,7 @@
   <properties>
     <server.version>7.0</server.version>
     <server.name>tomcat</server.name>
-    <image>consol/${server.name}-${server.version}:latest</image>
+    <image>docker.io/consol/${server.name}-${server.version}:latest</image>
     <jolokia.version>1.3.2</jolokia.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

diff --git a/src/main/java/io/fabric8/maven/docker/access/ContainerCreateConfig.java b/src/main/java/io/fabric8/maven/docker/access/ContainerCreateConfig.java
@@ -4,16 +4,15 @@
 import java.util.*;
 
 import io.fabric8.maven.docker.util.EnvUtil;
-import org.apache.commons.lang3.text.StrSubstitutor;
 import io.fabric8.maven.docker.config.Arguments;
+import org.apache.commons.text.StrSubstitutor;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
 public class ContainerCreateConfig {
 
     private final JSONObject createConfig = new JSONObject();
     private final String imageName;
-
     public ContainerCreateConfig(String imageName) {
         this.imageName = imageName;
         createConfig.put("Image", imageName);

diff --git a/src/main/java/io/fabric8/maven/docker/config/handler/property/PropertyConfigHandler.java b/src/main/java/io/fabric8/maven/docker/config/handler/property/PropertyConfigHandler.java
@@ -155,6 +155,7 @@ private NetworkConfig extractNetworkConfig(String prefix, Properties properties)
             .build();
     }
 
+    @SuppressWarnings("deprecation")
     private AssemblyConfiguration extractAssembly(String prefix, Properties properties) {
         return new AssemblyConfiguration.Builder()
                 .targetDir(withPrefix(prefix, ASSEMBLY_BASEDIR, properties))

diff --git a/src/main/java/io/fabric8/maven/docker/service/ContainerTracker.java b/src/main/java/io/fabric8/maven/docker/service/ContainerTracker.java
@@ -109,7 +109,7 @@ private void removeDescriptorFromPomLabelMap(ContainerShutdownDescriptor descrip
         Iterator<Map.Entry<PomLabel, List<ContainerShutdownDescriptor>>> mapIt = shutdownDescriptorPerPomLabelMap.entrySet().iterator();
         while(mapIt.hasNext()) {
             Map.Entry<PomLabel,List<ContainerShutdownDescriptor>> mapEntry = mapIt.next();
-            List descs = mapEntry.getValue();
+            List<ContainerShutdownDescriptor> descs = mapEntry.getValue();
             Iterator<ContainerShutdownDescriptor> it = descs.iterator();
             while (it.hasNext()) {
                 ContainerShutdownDescriptor desc = it.next();

diff --git a/src/main/java/io/fabric8/maven/docker/service/RunService.java b/src/main/java/io/fabric8/maven/docker/service/RunService.java
@@ -261,7 +261,8 @@ ContainerCreateConfig createContainerConfig(String imageName, RunImageConfigurat
             NetworkConfig networkConfig = runConfig.getNetworkingConfig();
             if(networkConfig.isCustomNetwork() && networkConfig.hasAliases()) {
                 ContainerNetworkingConfig networkingConfig =
-                    new ContainerNetworkingConfig().aliases(networkConfig);
+                    new ContainerNetworkingConfig()
+                        .aliases(networkConfig);
                 config.networkingConfig(networkingConfig);
             }
 

diff --git a/src/main/java/io/fabric8/maven/docker/service/WaitService.java b/src/main/java/io/fabric8/maven/docker/service/WaitService.java
@@ -13,7 +13,7 @@
 import io.fabric8.maven.docker.model.Container;
 import io.fabric8.maven.docker.util.Logger;
 import io.fabric8.maven.docker.wait.*;
-import org.apache.commons.lang3.text.StrSubstitutor;
+import org.apache.commons.text.StrSubstitutor;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.shared.utils.StringUtils;
 

diff --git a/src/test/java/io/fabric8/maven/docker/access/PortMappingTest.java b/src/test/java/io/fabric8/maven/docker/access/PortMappingTest.java
@@ -3,7 +3,7 @@
 import java.util.*;
 
 import io.fabric8.maven.docker.model.Container;
-import org.apache.commons.lang3.text.StrSubstitutor;
+import org.apache.commons.text.StrSubstitutor;
 import org.json.JSONArray;
 import org.junit.*;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -28,12 +28,12 @@ public void setup() {
 
     @Test
     public void testComplexMapping() {
-        
+
         givenAHostIpProperty("other.ip", "127.0.0.1");
-        
+
         givenAPortMapping("jolokia.port:8080", "18181:8181", "127.0.0.1:9090:9090", "+other.ip:${other.port}:5678");
         whenUpdateDynamicMapping(443);
-        
+
         whenUpdateDynamicMapping(8080, 49900, "0.0.0.0");
         whenUpdateDynamicMapping(5678, 49901, "127.0.0.1");
 
@@ -62,7 +62,7 @@ public void testComplexMapping() {
         thenBindToHostMapContains("9090/tcp", "127.0.0.1");
         thenBindToHostMapContains("5678/tcp", "127.0.0.1");
     }
-    
+
 
     @Test
     public void testHostIpAsPropertyOnly() {
@@ -75,10 +75,10 @@ public void testHostIpAsPropertyOnly() {
         thenDynamicHostPortsSizeIs(0);
         thenDynamicHostIpsSizeIs(1);
         thenBindToHostMapSizeIs(0);
-        
+
         thenHostIpVariableEquals("other.ip", "1.2.3.4");
     }
-    
+
     @Test
     public void testHostIpPortAsProperties() {
         givenADockerHostAddress("5.6.7.8");
@@ -93,7 +93,7 @@ public void testHostIpPortAsProperties() {
         thenHostPortVariableEquals("other.port", 49900);
         thenHostIpVariableEquals("other.ip", "1.2.3.4");
     }
-    
+
     @Test
     public void testHostIpVariableReplacement() {
         givenAPortMapping("jolokia.port:8080");
@@ -135,18 +135,18 @@ public void testHostPortAsPropertyOnly() {
     public void testInvalidHostnameWithDynamicPort() {
         givenAPortMapping("does-not-exist.pvt:web.port:80");
     }
-    
+
     @Ignore
     @Test(expected = IllegalArgumentException.class)
     public void testInvalidHostnameWithFixedPort() {
         givenAPortMapping("does-not-exist.pvt:80:80");
     }
-    
+
     @Test(expected = IllegalArgumentException.class)
     public void testInvalidMapping() {
         givenAPortMapping("bla");
     }
-    
+
     @Test(expected = IllegalArgumentException.class)
     public void testInvalidMapping2() {
         givenAPortMapping("jolokia.port:bla");
@@ -208,11 +208,11 @@ private void thenAssertJsonEquals(String json) {
     private void givenADockerHostAddress(String host) {
         properties.setProperty("docker.host.address", host);
     }
-    
+
     private void givenAHostIpProperty(String property, String hostIp) {
         properties.put(property, hostIp);
     }
-    
+
     private void givenAPortMapping(String... mappings) {
         mapping = new PortMapping(Arrays.asList(mappings), properties);
     }
@@ -277,7 +277,7 @@ private void thenMapAndVerifyReplacement(String... args) {
             assertEquals(args[i], StrSubstitutor.replace(args[i + 1], mapping.getHostPortVariableMap()));
         }
     }
-    
+
     private void whenUpdateDynamicMapping(int cPort) {
         Map<String, Container.PortBinding> dynMapping = new HashMap<>();
         dynMapping.put(cPort + "/tcp", null);