upgrade com.spotify:docker-client
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/61ea0e6a Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/61ea0e6a Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/61ea0e6a Branch: refs/heads/master Commit: 61ea0e6a7e3a2923501bb5a94bc4d0e11dbfdd16 Parents: 03f3486 Author: duc <[email protected]> Authored: Wed Jul 25 16:18:13 2018 +0700 Committer: benwa <[email protected]> Committed: Thu Jul 26 13:47:39 2018 +0700 ---------------------------------------------------------------------- mpt/impl/imap-mailbox/cyrus/pom.xml | 6 ++++++ .../org/apache/james/mpt/imapmailbox/cyrus/host/Docker.java | 7 ++++--- pom.xml | 5 ----- 3 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/61ea0e6a/mpt/impl/imap-mailbox/cyrus/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cyrus/pom.xml b/mpt/impl/imap-mailbox/cyrus/pom.xml index f189fb4..0db3799 100644 --- a/mpt/impl/imap-mailbox/cyrus/pom.xml +++ b/mpt/impl/imap-mailbox/cyrus/pom.xml @@ -42,6 +42,12 @@ <dependency> <groupId>com.spotify</groupId> <artifactId>docker-client</artifactId> + <version>8.11.7</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>20.0</version> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/james-project/blob/61ea0e6a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/Docker.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/Docker.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/Docker.java index 31767bb..0eeb63a 100644 --- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/Docker.java +++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/host/Docker.java @@ -27,9 +27,10 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.jayway.awaitility.Awaitility; import com.spotify.docker.client.DefaultDockerClient; -import com.spotify.docker.client.DockerException; +import com.spotify.docker.client.exceptions.DockerException; import com.spotify.docker.client.messages.ContainerConfig; import com.spotify.docker.client.messages.ContainerCreation; +import com.spotify.docker.client.messages.ExecCreation; import com.spotify.docker.client.messages.HostConfig; public class Docker { @@ -114,7 +115,7 @@ public class Docker { public void createUser(ContainerCreation container, String user, String password) throws DockerException, InterruptedException { String createUserCommand = String.format("echo %s | saslpasswd2 -u test -c %s -p", password, user); - String execId = dockerClient.execCreate(container.id(), new String[] {"/bin/bash", "-c", createUserCommand}); - dockerClient.execStart(execId); + ExecCreation execCreation = dockerClient.execCreate(container.id(), new String[]{"/bin/bash", "-c", createUserCommand}); + dockerClient.execStart(execCreation.id()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/61ea0e6a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c540102..4f14c27 100644 --- a/pom.xml +++ b/pom.xml @@ -1695,11 +1695,6 @@ <version>2.6.0</version> </dependency> <dependency> - <groupId>com.spotify</groupId> - <artifactId>docker-client</artifactId> - <version>3.5.10</version> - </dependency> - <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> <version>1.6.1</version> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
