From 71da3008acf9ebc054660e1e7960af191867ad1b Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 13 Jun 2023 11:56:03 +0100 Subject: [PATCH] upgrade test dependencies used by docker-client (#389) Update Dependencies.scala --- project/Dependencies.scala | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index fd9700bd6f..200791e78a 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -150,10 +150,14 @@ object Dependencies { } object TestDependencies { + val bcpkix = "org.bouncycastle" % "bcpkix-jdk15on" % "1.68" % Test val commonsMath = "org.apache.commons" % "commons-math" % "2.2" % Test val commonsIo = "commons-io" % "commons-io" % "2.11.0" % Test val commonsCodec = "commons-codec" % "commons-codec" % "1.15" % Test - val junit = "junit" % "junit" % junitVersion % "test" + val commonsCompress = "org.apache.commons" % "commons-compress" % "1.23.0" % Test + val junit = "junit" % "junit" % junitVersion % Test + val httpClient = "org.apache.httpcomponents" % "httpclient" % "4.5.14" % Test + val logback = Compile.logback % Test val scalatest = Def.setting { "org.scalatest" %% "scalatest" % scalaTestVersion.value % Test } // ApacheV2 @@ -262,12 +266,19 @@ object Dependencies { TestDependencies.scalatest.value, TestDependencies.scalatestJUnit.value, TestDependencies.scalatestScalaCheck.value, + TestDependencies.bcpkix, // to force TestDependencies.dockerClient to use safe version of this lib TestDependencies.commonsCodec, + TestDependencies.commonsCompress, // to force TestDependencies.dockerClient to use safe version of this lib + TestDependencies.commonsIo, // to force TestDependencies.dockerClient to use safe version of this lib TestDependencies.commonsMath, + TestDependencies.httpClient, // to force TestDependencies.dockerClient to use safe version of this lib TestDependencies.jimfs, TestDependencies.dockerClient, Provided.activation // dockerClient needs javax.activation.DataSource in JDK 11+ - ) ++ TestDependencies.jackson.value // TestDependencies.dockerClient bring in older versions of Jackson which has CVEs + ) ++ { + // TestDependencies.dockerClient bring in older versions of libs that have CVEs + TestDependencies.jackson.value + } val actorTestkitTyped = l ++= Seq( Provided.logback,