Skip to content

Commit 05b6f97

Browse files
authored
Merge branch 'master' into scala-3-migration
2 parents 16a8afd + b125545 commit 05b6f97

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
283283

284284
val circeVersion = "0.14.6"
285285
val monixVersion = "3.4.1"
286-
val elastic4sVersion = "8.11.1"
286+
val elastic4sVersion = "8.11.3"
287287
val sparkVersion = "3.5.0"
288288

289289
val sparkCoreDep = "org.apache.spark" %% "spark-core" % sparkVersion
@@ -390,10 +390,10 @@ lazy val scala_libraries_4 = (project in file("scala-libraries-4"))
390390
"org.testcontainers" % "pulsar" % "1.19.3" % IntegrationTest
391391
),
392392
libraryDependencies ++= Seq(
393-
"software.amazon.awssdk" % "s3" % "2.21.29"
393+
"software.amazon.awssdk" % "s3" % "2.21.37"
394394
),
395395
libraryDependencies ++= Seq(
396-
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.595" % IntegrationTest,
396+
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.604" % IntegrationTest,
397397
"com.dimafeng" %% "testcontainers-scala-scalatest" % "0.41.0" % IntegrationTest,
398398
"com.dimafeng" %% "testcontainers-scala-localstack-v2" % "0.41.0" % IntegrationTest
399399
),

play-scala/caching-in-play/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ libraryDependencies += guice
1111
libraryDependencies += caffeine
1212
libraryDependencies += ws
1313
libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.0" % Test
14-
libraryDependencies += "org.mockito" % "mockito-core" % "5.7.0" % Test
14+
libraryDependencies += "org.mockito" % "mockito-core" % "5.8.0" % Test
1515

1616
PlayKeys.devSettings += "play.server.http.port" -> "9000"

scalatra/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ libraryDependencies ++= Seq(
1313
"javax.servlet" % "javax.servlet-api" % "4.0.1" % "provided",
1414
"org.scalatra" %% "scalatra-auth" % ScalatraVersion,
1515
"org.scalatra" %% "scalatra-json" % "2.8.4",
16-
"org.json4s" %% "json4s-jackson" % "4.0.6",
16+
"org.json4s" %% "json4s-jackson" % "4.0.7",
1717
"com.typesafe.slick" %% "slick" % "3.4.1",
1818
"com.h2database" % "h2" % "2.1.214",
1919
"com.mchange" % "c3p0" % "0.9.5.5"

0 commit comments

Comments
 (0)