This is an automated email from the ASF dual-hosted git repository. fanningpj pushed a commit to branch 1.0.x in repository https://gitbox.apache.org/repos/asf/pekko.git
commit 87d30033950dd33ba90458dab8be1e3b9fc7adbf Author: PJ Fanning <[email protected]> AuthorDate: Fri Jan 12 22:06:01 2024 +0100 tidy up imports in new docker code (#930) * tidy up imports in new docker code * try to fix issues * Update Dependencies.scala --- .../apache/pekko/io/dns/DockerBindDnsService.scala | 19 ++++++------------- project/Dependencies.scala | 9 +++------ 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala index 614bee5410..066f27fb39 100644 --- a/actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala +++ b/actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala @@ -18,24 +18,17 @@ import scala.util.Try import scala.util.control.NonFatal import com.typesafe.config.Config -import com.github.dockerjava.core.DockerClientConfig -import com.github.dockerjava.api.model.HostConfig; -import com.github.dockerjava.core.DefaultDockerClientConfig -import com.github.dockerjava.api.model.Frame; -import com.github.dockerjava.api.async.ResultCallback; +import com.github.dockerjava.api.DockerClient +import com.github.dockerjava.api.async.ResultCallback +import com.github.dockerjava.api.command.CreateContainerCmd +import com.github.dockerjava.api.model._ +import com.github.dockerjava.core.{ DefaultDockerClientConfig, DockerClientConfig, DockerClientImpl } +import com.github.dockerjava.httpclient5.ApacheDockerHttpClient import org.scalatest.concurrent.Eventually import org.apache.pekko import pekko.testkit.PekkoSpec import pekko.util.ccompat.JavaConverters._ -import com.github.dockerjava.api.DockerClient -import com.github.dockerjava.httpclient5.ApacheDockerHttpClient -import com.github.dockerjava.api.command.CreateContainerCmd -import com.github.dockerjava.api.model.PortBinding -import com.github.dockerjava.api.model.Container -import com.github.dockerjava.api.model.Volume -import com.github.dockerjava.core.DockerClientImpl -import com.github.dockerjava.api.model.Bind abstract class DockerBindDnsService(config: Config) extends PekkoSpec(config) with Eventually { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 2c690612fd..ea0ecb5bcc 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -243,6 +243,7 @@ object Dependencies { val testkit = l ++= Seq(TestDependencies.junit, TestDependencies.scalatest.value) ++ TestDependencies.metricsAll + // TestDependencies.dockerClient brings in older versions of jackson libs that have CVEs val actorTests = l ++= Seq( TestDependencies.junit, TestDependencies.scalatest.value, @@ -250,12 +251,8 @@ object Dependencies { TestDependencies.scalatestScalaCheck.value, TestDependencies.commonsCodec, TestDependencies.commonsMath, - TestDependencies.jimfs) ++ { - // TestDependencies.dockerClient bring in older versions of libs that have CVEs - TestDependencies.jackson.value - } ++ { - TestDependencies.dockerClient.value - } + TestDependencies.jimfs) ++ + TestDependencies.jackson.value ++ TestDependencies.dockerClient.value val actorTestkitTyped = l ++= Seq( Provided.logback, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
