Skip to content

Commit 43ad63f

Browse files
authored
Merge branch 'master' into update/spark-sql-4.0.0
2 parents 3f6d656 + 22ded11 commit 43ad63f

File tree

12 files changed

+29
-28
lines changed

12 files changed

+29
-28
lines changed

build.sbt

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ val catsEffect = "org.typelevel" %% "cats-effect" % "3.6.1"
88
val catEffectTest = "org.typelevel" %% "cats-effect-testkit" % "3.6.1" % Test
99
val scalaReflection = "org.scala-lang" % "scala-reflect" % scalaV
1010
val logback = "ch.qos.logback" % "logback-classic" % "1.5.17"
11-
val embedMongoVersion = "4.20.0"
11+
val embedMongoVersion = "4.20.1"
1212
val AkkaVersion = "2.9.3"
1313
val AlpakkaVersion = "8.0.0"
1414
val AkkaHttpVersion = "10.6.3"
@@ -20,7 +20,7 @@ val scalaTestDeps = Seq(
2020
"org.scalatest" %% "scalatest-flatspec" % "3.2.19" % Test
2121
)
2222

23-
val scalaMock = "org.scalamock" %% "scalamock" % "7.3.2" % Test
23+
val scalaMock = "org.scalamock" %% "scalamock" % "7.3.3" % Test
2424
val zioVersion = "2.1.19"
2525

2626
lazy val scala_core = (project in file("scala-core-modules/scala-core"))
@@ -280,7 +280,7 @@ lazy val scala_akka_dependencies: Seq[ModuleID] = Seq(
280280
akkaTypedTestkit,
281281
"com.lightbend.akka" %% "akka-stream-alpakka-mongodb" % AlpakkaVersion,
282282
akkaStreamDep,
283-
"org.mongodb.scala" %% "mongo-scala-driver" % "5.5.0",
283+
"org.mongodb.scala" %% "mongo-scala-driver" % "5.5.1",
284284
"com.lightbend.akka" %% "akka-stream-alpakka-file" % AlpakkaVersion,
285285
jUnitInterface,
286286
embeddedMongo % Test,
@@ -363,7 +363,7 @@ val fs2Version = "3.12.0"
363363
val reactiveMongo = "1.1.0-RC15"
364364
val slickPgVersion = "0.23.1"
365365
val scalaTestContainersVersion = "0.43.0"
366-
val postgresqlVersion = "42.7.6"
366+
val postgresqlVersion = "42.7.7"
367367
val json4sVersion = "4.0.7"
368368

369369
lazy val scala2_libraries =
@@ -396,7 +396,7 @@ lazy val scala2_libraries =
396396
"org.scala-lang.modules" %% "scala-async" % "1.0.1",
397397
"com.clever-cloud.pulsar4s" %% "pulsar4s-core" % "2.11.0",
398398
"com.clever-cloud.pulsar4s" %% "pulsar4s-jackson" % "2.11.0",
399-
"org.testcontainers" % "pulsar" % "1.21.0" % IntegrationTest,
399+
"org.testcontainers" % "pulsar" % "1.21.2" % IntegrationTest,
400400
"org.apache.kafka" % "kafka-clients" % kafkaVersion,
401401
"com.fasterxml.jackson.core" % "jackson-databind" % jackSonVersion,
402402
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % jackSonVersion,
@@ -414,10 +414,11 @@ lazy val scala2_libraries =
414414
Defaults.itSettings
415415
)
416416

417-
val circeVersion = "0.14.13"
417+
val circeVersion = "0.14.14"
418418
val monixVersion = "3.4.1"
419+
419420
val sparkVersion = "4.0.0"
420-
val elastic4sVersion = "8.18.1"
421+
val elastic4sVersion = "8.18.2"
421422

422423
val sparkCoreDep = "org.apache.spark" %% "spark-core" % sparkVersion
423424
val sparkSqlDep = "org.apache.spark" %% "spark-sql" % sparkVersion
@@ -439,7 +440,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
439440
circeParserDep,
440441
"com.softwaremill.retry" %% "retry" % "0.3.6",
441442
log4jApiScalaDep,
442-
"org.apache.logging.log4j" % "log4j-core" % "2.24.3" % Runtime,
443+
"org.apache.logging.log4j" % "log4j-core" % "2.25.0" % Runtime,
443444
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
444445
"software.amazon.awssdk" % "s3" % "2.25.9",
445446
"com.github.seratch" %% "awscala" % "0.9.2",
@@ -471,7 +472,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
471472
"org.elasticmq" %% "elasticmq-rest-sqs" % "1.6.12"
472473
),
473474
libraryDependencies ++= Seq(
474-
"software.amazon.awssdk" % "sqs" % "2.31.58"
475+
"software.amazon.awssdk" % "sqs" % "2.31.68"
475476
),
476477
Defaults.itSettings
477478
)
@@ -505,7 +506,7 @@ lazy val scala_libraries_os = (project in file("scala-libraries-os"))
505506
libraryDependencies ++= scalaTestDeps,
506507
libraryDependencies ++= Seq(
507508
log4jApiScalaDep,
508-
"org.apache.logging.log4j" % "log4j-core" % "2.24.3" % Runtime
509+
"org.apache.logging.log4j" % "log4j-core" % "2.25.0" % Runtime
509510
),
510511
libraryDependencies += osLibDep
511512
)
@@ -549,13 +550,13 @@ lazy val nscalatime = (project in file("scala-libraries-standalone/nscalatime"))
549550
)
550551

551552
val spireVersion = "0.18.0"
552-
val kafkaVersion = "7.9.1-ce"
553+
val kafkaVersion = "7.9.2-ce"
553554
val pureconfigVersion = "0.17.9"
554-
val jackSonVersion = "2.19.0"
555+
val jackSonVersion = "2.19.1"
555556
val log4jApiScalaVersion = "13.1.0"
556557
val log4jVersion = "2.20.0"
557558
val avro4sVersion = "4.1.2"
558-
val kafkaAvroSerializer = "7.9.1"
559+
val kafkaAvroSerializer = "7.9.2"
559560

560561
val pureConfigDep = "com.github.pureconfig" %% "pureconfig" % pureconfigVersion
561562

@@ -592,10 +593,10 @@ lazy val scala_libraries_testing = (project in file("scala-libraries-testing"))
592593
scalaMock,
593594
"com.lihaoyi" %% "utest" % "0.8.5" % "test",
594595
munitDep,
595-
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.785" % IntegrationTest,
596+
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.787" % IntegrationTest,
596597
"com.dimafeng" %% "testcontainers-scala-scalatest" % scalaTestContainersVersion % IntegrationTest,
597598
"com.dimafeng" %% "testcontainers-scala-localstack-v2" % scalaTestContainersVersion % IntegrationTest,
598-
"software.amazon.awssdk" % "s3" % "2.31.58"
599+
"software.amazon.awssdk" % "s3" % "2.31.68"
599600
),
600601
Defaults.itSettings,
601602
IntegrationTest / fork := true
@@ -699,7 +700,7 @@ lazy val cats_effects = (project in file("cats-effects"))
699700
libraryDependencies += "junit" % "junit" % "4.13.2" % Test
700701
)
701702

702-
val zioJsonDep = "dev.zio" %% "zio-json" % "0.7.43"
703+
val zioJsonDep = "dev.zio" %% "zio-json" % "0.7.44"
703704
val zioTestSbt = "dev.zio" %% "zio-test-sbt" % zioVersion % Test
704705

705706
lazy val zio = (project in file("zio"))
@@ -721,7 +722,7 @@ lazy val zio2 = (project in file("zio-2"))
721722
name := "zio-2",
722723
scalaVersion := scala3Version,
723724
libraryDependencies += "dev.zio" %% "zio" % zioVersion,
724-
libraryDependencies += "dev.zio" %% "zio-json" % "0.7.43",
725+
libraryDependencies += "dev.zio" %% "zio-json" % "0.7.44",
725726
libraryDependencies += "dev.zio" %% "zio-test" % zioVersion % Test,
726727
libraryDependencies += "dev.zio" %% "zio-test-sbt" % zioVersion % Test,
727728
libraryDependencies += "dev.zio" %% "zio-logging" % "2.1.17",

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
sbt.version=1.11.1
1+
sbt.version=1.11.2
22

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
22

3-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.7")
3+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8")
44
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0")
55

66
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.2.1")

sbt-release/project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 1.11.1
1+
sbt.version = 1.11.2
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.1
1+
sbt.version=1.11.2
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.1
1+
sbt.version=1.11.2
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.1
1+
sbt.version=1.11.2

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.33"
2+
val tapirV = "1.11.34"
33
ThisBuild / scalaVersion := scalaV
44
ThisBuild / version := "1.0.0"
55
ThisBuild / organization := "com.baeldung"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.1
1+
sbt.version=1.11.2
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.1
1+
sbt.version=1.11.2

scalatra/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ libraryDependencies ++= Seq(
1616
"org.json4s" %% "json4s-jackson" % "4.0.7",
1717
"com.typesafe.slick" %% "slick" % "3.6.1",
1818
"com.h2database" % "h2" % "2.1.214",
19-
"com.mchange" % "c3p0" % "0.11.0"
19+
"com.mchange" % "c3p0" % "0.11.1"
2020
)
2121
libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
2222
enablePlugins(SbtTwirl)

scalatra/project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.1
1+
sbt.version=1.11.2

0 commit comments

Comments
 (0)