Skip to content

Commit f6f0bcf

Browse files
authored
Merge branch 'master' into update/logback-classic-1.5.8
2 parents 7759e7d + a05bdac commit f6f0bcf

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

build.sbt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ lazy val scala_akka_dependencies: Seq[ModuleID] = Seq(
271271
akkaTypedTestkit,
272272
"com.lightbend.akka" %% "akka-stream-alpakka-mongodb" % "5.0.0",
273273
akkaStreamDep,
274-
"org.mongodb.scala" %% "mongo-scala-driver" % "5.1.3",
274+
"org.mongodb.scala" %% "mongo-scala-driver" % "5.1.4",
275275
"com.lightbend.akka" %% "akka-stream-alpakka-file" % "5.0.0",
276276
jUnitInterface,
277277
embeddedMongo % Test,
@@ -402,7 +402,7 @@ lazy val scala2_libraries =
402402
val circeVersion = "0.14.9"
403403
val monixVersion = "3.4.1"
404404
val sparkVersion = "3.5.2"
405-
val elastic4sVersion = "8.14.1"
405+
val elastic4sVersion = "8.15.0"
406406

407407
val sparkCoreDep = "org.apache.spark" %% "spark-core" % sparkVersion
408408
val sparkSqlDep = "org.apache.spark" %% "spark-sql" % sparkVersion
@@ -424,7 +424,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
424424
circeParserDep,
425425
"com.softwaremill.retry" %% "retry" % "0.3.6",
426426
log4jApiScalaDep,
427-
"org.apache.logging.log4j" % "log4j-core" % "2.23.1" % Runtime,
427+
"org.apache.logging.log4j" % "log4j-core" % "2.24.0" % Runtime,
428428
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
429429
"software.amazon.awssdk" % "s3" % "2.25.9",
430430
"com.github.seratch" %% "awscala" % "0.9.2"
@@ -451,14 +451,14 @@ lazy val scala_libraries = (project in file("scala-libraries"))
451451
"org.elasticmq" %% "elasticmq-core" % "1.6.7",
452452
"org.elasticmq" %% "elasticmq-server" % "1.6.7",
453453
"org.elasticmq" %% "elasticmq-rest-sqs" % "1.6.7",
454-
"software.amazon.awssdk" % "sqs" % "2.27.16"
454+
"software.amazon.awssdk" % "sqs" % "2.27.21"
455455
),
456456
Defaults.itSettings
457457
)
458458

459459
val http4sBlaze = "0.23.16"
460460
val http4sVersion = "0.23.27"
461-
val osLibVersion = "0.10.4"
461+
val osLibVersion = "0.10.5"
462462

463463
val osLibDep = "com.lihaoyi" %% "os-lib" % osLibVersion
464464

@@ -474,7 +474,7 @@ lazy val scala_libraries_os = (project in file("scala-libraries-os"))
474474
libraryDependencies ++= scalaTestDeps,
475475
libraryDependencies ++= Seq(
476476
log4jApiScalaDep,
477-
"org.apache.logging.log4j" % "log4j-core" % "2.23.1" % Runtime
477+
"org.apache.logging.log4j" % "log4j-core" % "2.24.0" % Runtime
478478
),
479479
libraryDependencies += osLibDep
480480
)
@@ -561,10 +561,10 @@ lazy val scala_libraries_testing = (project in file("scala-libraries-testing"))
561561
scalaMock,
562562
"com.lihaoyi" %% "utest" % "0.8.4" % "test",
563563
munitDep,
564-
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.770" % IntegrationTest,
564+
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.771" % IntegrationTest,
565565
"com.dimafeng" %% "testcontainers-scala-scalatest" % "0.41.3" % IntegrationTest,
566566
"com.dimafeng" %% "testcontainers-scala-localstack-v2" % "0.41.3" % IntegrationTest,
567-
"software.amazon.awssdk" % "s3" % "2.27.16"
567+
"software.amazon.awssdk" % "s3" % "2.27.21"
568568
),
569569
Defaults.itSettings,
570570
IntegrationTest / fork := true

project/ScalaVersions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ object ScalaVersions {
44
@deprecated(
55
"Use Scala 2.13 or Scala 3. Don't use 2.12 unless it is a specific feature in 2.12."
66
)
7-
val scala212Version = "2.12.19"
7+
val scala212Version = "2.12.20"
88
}

scala-libraries-standalone/tapir/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
val scalaV = "2.12.16"
2-
val tapirV = "1.11.1"
2+
val tapirV = "1.11.2"
33
ThisBuild / scalaVersion := scalaV
44
ThisBuild / version := "1.0.0"
55
ThisBuild / organization := "com.baeldung"

scalatra/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ libraryDependencies ++= Seq(
99
"org.scalatra" %% "scalatra" % ScalatraVersion,
1010
"org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test",
1111
"ch.qos.logback" % "logback-classic" % "1.5.8" % "runtime",
12-
"org.eclipse.jetty" % "jetty-webapp" % "11.0.23" % "container",
12+
"org.eclipse.jetty" % "jetty-webapp" % "11.0.24" % "container",
1313
"javax.servlet" % "javax.servlet-api" % "4.0.1" % "provided",
1414
"org.scalatra" %% "scalatra-auth" % ScalatraVersion,
1515
"org.scalatra" %% "scalatra-json" % "2.8.4",

0 commit comments

Comments
 (0)