[camel] branch master updated: Upgrade Docker Java and related bundle to version 3.1.2

[acosentino]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new ed73f60  Upgrade Docker Java and related bundle to version 3.1.2
ed73f60 is described below

commit ed73f60da62afb537a8a2c8e9f4633d03f1ae6eb
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu May 9 15:21:04 2019 +0200

    Upgrade Docker Java and related bundle to version 3.1.2
---
 .../camel/component/docker/it/FakeDockerCmdExecFactory.java       | 6 ++++++
 parent/pom.xml                                                    | 4 ++--
 .../spring-boot/components-starter/camel-docker-starter/pom.xml   | 8 --------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git 
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/FakeDockerCmdExecFactory.java
 
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/FakeDockerCmdExecFactory.java
index 87ed0c0..42454d7 100644
--- 
a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/FakeDockerCmdExecFactory.java
+++ 
b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/FakeDockerCmdExecFactory.java
@@ -62,6 +62,7 @@ import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.LogSwarmObjectCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PruneCmd.Exec;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
@@ -450,4 +451,9 @@ public class FakeDockerCmdExecFactory implements 
DockerCmdExecFactory {
     public void close() throws IOException {
         // Noop
     }
+
+       @Override
+       public Exec pruneCmdExec() {
+               return null;
+       }
 }
\ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml
index bd5e8f3..cf87217 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -175,8 +175,8 @@
         <disruptor-version>3.4.2</disruptor-version>
         <dnsjava-version>2.1.8</dnsjava-version>
         <dnsjava-bundle-version>2.1.8_1</dnsjava-bundle-version>
-        <docker-java-version>3.1.1</docker-java-version>
-        <docker-java-bundle-version>3.1.1_1</docker-java-bundle-version>
+        <docker-java-version>3.1.2</docker-java-version>
+        <docker-java-bundle-version>3.1.2_1</docker-java-bundle-version>
         <dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
         <dozer-version>6.4.1</dozer-version>
         <drools-version>7.21.0.Final</drools-version>
diff --git 
a/platforms/spring-boot/components-starter/camel-docker-starter/pom.xml 
b/platforms/spring-boot/components-starter/camel-docker-starter/pom.xml
index 98a0e94..e0131cc 100644
--- a/platforms/spring-boot/components-starter/camel-docker-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-docker-starter/pom.xml
@@ -38,14 +38,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-docker</artifactId>
       <version>${project.version}</version>
-      <!--START OF GENERATED CODE-->
-      <exclusions>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-      </exclusions>
-      <!--END OF GENERATED CODE-->
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>