You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/06/08 12:41:46 UTC
[camel] 03/04: Upgrade DockerJava to version 3.2.1
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
commit ab34d711e004458b6fe5d4388ce9b7c4a0803344
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jun 8 13:19:04 2020 +0200
Upgrade DockerJava to version 3.2.1
---
.../component/docker/DockerClientFactory.java | 4 +--
.../docker/it/FakeDockerCmdExecFactory.java | 31 +++++++++++++++++-----
parent/pom.xml | 2 +-
3 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientFactory.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientFactory.java
index 97df4b1..bedf652 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientFactory.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientFactory.java
@@ -125,9 +125,7 @@ public final class DockerClientFactory {
factory = new JerseyDockerCmdExecFactory();
((JerseyDockerCmdExecFactory) factory)
.withReadTimeout(clientProfile.getRequestTimeout())
- .withConnectTimeout(clientProfile.getRequestTimeout())
- .withMaxTotalConnections(clientProfile.getMaxTotalConnections())
- .withMaxPerRouteConnections(clientProfile.getMaxPerRouteConnections());
+ .withConnectTimeout(clientProfile.getRequestTimeout());
} else if (cmdExecFactory.equals(NettyDockerCmdExecFactory.class.getName())) {
factory = new NettyDockerCmdExecFactory();
((NettyDockerCmdExecFactory) factory)
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 3892577..fe14ade 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
@@ -96,12 +96,7 @@ public class FakeDockerCmdExecFactory implements DockerCmdExecFactory {
public FakeDockerCmdExecFactory() {
}
-
- @Override
- public void init(DockerClientConfig dockerClientConfig) {
- // Noop
- }
-
+
@Override
public VersionCmd.Exec createVersionCmdExec() {
return new VersionCmd.Exec() {
@@ -456,4 +451,28 @@ public class FakeDockerCmdExecFactory implements DockerCmdExecFactory {
public Exec pruneCmdExec() {
return null;
}
+
+ @Override
+ public com.github.dockerjava.api.command.SaveImagesCmd.Exec createSaveImagesCmdExec() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public com.github.dockerjava.api.command.ListSecretsCmd.Exec createListSecretsCmdExec() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public com.github.dockerjava.api.command.CreateSecretCmd.Exec createCreateSecretCmdExec() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public com.github.dockerjava.api.command.RemoveSecretCmd.Exec createRemoveSecretCmdExec() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 8ea8cea..2072ef1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -149,7 +149,7 @@
<dnsjava-version>3.0.1</dnsjava-version>
<djl-version>0.4.0</djl-version>
<djl-mxnet-native-version>1.6.0</djl-mxnet-native-version>
- <docker-java-version>3.1.5</docker-java-version>
+ <docker-java-version>3.2.1</docker-java-version>
<dozer-version>6.5.0</dozer-version>
<drools-version>7.38.0.Final</drools-version>
<dropbox-version>3.1.3</dropbox-version>