Skip to content

Commit 675e215

Browse files
authored
Merge branch 'master' into update/commons-csv-1.13.0
2 parents 22559f8 + fcbfc6f commit 675e215

File tree

13 files changed

+20
-20
lines changed

13 files changed

+20
-20
lines changed

build.sbt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ lazy val scala_test_junit4 = (project in file("scala-test-junit4"))
293293
scalaVersion := scala3Version,
294294
libraryDependencies ++=
295295
Seq(
296-
"org.scalatestplus" %% "junit-4-13" % "3.2.19.0" % Test,
296+
"org.scalatestplus" %% "junit-4-13" % "3.2.19.1" % Test,
297297
jUnitInterface
298298
)
299299
)
@@ -414,10 +414,10 @@ lazy val scala2_libraries =
414414
Defaults.itSettings
415415
)
416416

417-
val circeVersion = "0.14.10"
417+
val circeVersion = "0.14.12"
418418
val monixVersion = "3.4.1"
419419
val sparkVersion = "3.5.5"
420-
val elastic4sVersion = "8.16.0"
420+
val elastic4sVersion = "8.17.1"
421421

422422
val sparkCoreDep = "org.apache.spark" %% "spark-core" % sparkVersion
423423
val sparkSqlDep = "org.apache.spark" %% "spark-sql" % sparkVersion
@@ -443,7 +443,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
443443
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
444444
"software.amazon.awssdk" % "s3" % "2.25.9",
445445
"com.github.seratch" %% "awscala" % "0.9.2",
446-
"com.opencsv" % "opencsv" % "5.9",
446+
"com.opencsv" % "opencsv" % "5.10",
447447
"com.github.tototoshi" %% "scala-csv" % "2.0.0",
448448
"org.apache.commons" % "commons-csv" % "1.13.0"
449449
),
@@ -471,7 +471,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
471471
"org.elasticmq" %% "elasticmq-rest-sqs" % "1.6.11"
472472
),
473473
libraryDependencies ++= Seq(
474-
"software.amazon.awssdk" % "sqs" % "2.30.36"
474+
"software.amazon.awssdk" % "sqs" % "2.30.38"
475475
),
476476
Defaults.itSettings
477477
)
@@ -595,7 +595,7 @@ lazy val scala_libraries_testing = (project in file("scala-libraries-testing"))
595595
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.782" % IntegrationTest,
596596
"com.dimafeng" %% "testcontainers-scala-scalatest" % scalaTestContainersVersion % IntegrationTest,
597597
"com.dimafeng" %% "testcontainers-scala-localstack-v2" % scalaTestContainersVersion % IntegrationTest,
598-
"software.amazon.awssdk" % "s3" % "2.30.36"
598+
"software.amazon.awssdk" % "s3" % "2.30.38"
599599
),
600600
Defaults.itSettings,
601601
IntegrationTest / fork := true
@@ -739,7 +739,7 @@ lazy val zio3 = (project in file("zio3"))
739739
.settings(
740740
libraryDependencies ++= Seq(
741741
zioJsonDep,
742-
"dev.zio" %% "zio-http" % "3.0.1",
742+
"dev.zio" %% "zio-http" % "3.1.0",
743743
"io.getquill" %% "quill-zio" % "4.8.5",
744744
"io.getquill" %% "quill-jdbc-zio" % "4.8.5",
745745
"com.h2database" % "h2" % "2.2.220"
@@ -748,7 +748,7 @@ lazy val zio3 = (project in file("zio3"))
748748
"dev.zio" %% "zio-test" % zioVersion % Test,
749749
zioTestSbt,
750750
"dev.zio" %% "zio-test-magnolia" % zioVersion % Test,
751-
"dev.zio" %% "zio-http-testkit" % "3.0.1" % Test
751+
"dev.zio" %% "zio-http-testkit" % "3.1.0" % Test
752752
),
753753
testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"),
754754
run / fork := true

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" % LibraryVersions.scalatestPlayVersion % Test
14-
libraryDependencies += "org.mockito" % "mockito-core" % "5.16.0" % Test
14+
libraryDependencies += "org.mockito" % "mockito-core" % "5.16.1" % Test
1515

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

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.10.10
1+
sbt.version=1.10.11
22

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.2.1")
77
libraryDependencies += "ai.kien" %% "python-native-libs" % "0.2.4"
88

99
// Make sure to keep the play plugin in sync with the sub modules under play-scala group
10-
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.6")
10+
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.7")
1111

1212
addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.1")
1313
addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.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.10.10
1+
sbt.version = 1.10.11
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.10
1+
sbt.version=1.10.11
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.10
1+
sbt.version=1.10.11
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.10
1+
sbt.version=1.10.11

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.17"
2+
val tapirV = "1.11.19"
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.10.10
1+
sbt.version=1.10.11
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.10
1+
sbt.version=1.10.11

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.17" % "runtime",
12-
"org.eclipse.jetty" % "jetty-webapp" % "11.0.24" % "container",
12+
"org.eclipse.jetty" % "jetty-webapp" % "11.0.25" % "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",

scalatra/project/build.properties

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

0 commit comments

Comments
 (0)