Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ val reactiveMongo = "1.1.0-RC18"
val slickPgVersion = "0.23.1"
val scalaTestContainersVersion = "0.43.0"
val postgresqlVersion = "42.7.8"
val json4sVersion = "4.0.7"
val json4sVersion = "4.1.0"

lazy val scala2_libraries =
(project in file("scala-2-modules/scala2-libraries"))
Expand Down Expand Up @@ -624,7 +624,7 @@ lazy val scala_libraries_persistence =
"com.typesafe.slick" %% "slick-hikaricp" % slickVersion,
"org.postgresql" % "postgresql" % postgresqlVersion,
"com.github.tminglei" %% "slick-pg" % slickPgVersion,
"org.json4s" %% "json4s-native" % json4sVersion,
"io.github.json4s" %% "json4s-native" % json4sVersion,
"com.github.tminglei" %% "slick-pg_json4s" % slickPgVersion,
"com.dimafeng" %% "testcontainers-scala-scalatest" % scalaTestContainersVersion % IntegrationTest,
"com.dimafeng" %% "testcontainers-scala-postgresql" % scalaTestContainersVersion % IntegrationTest
Expand Down
2 changes: 1 addition & 1 deletion scalatra/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ libraryDependencies ++= Seq(
"javax.servlet" % "javax.servlet-api" % "4.0.1" % "provided",
"org.scalatra" %% "scalatra-auth" % ScalatraVersion,
"org.scalatra" %% "scalatra-json" % "2.8.4",
"org.json4s" %% "json4s-jackson" % "4.0.7",
"io.github.json4s" %% "json4s-jackson" % "4.1.0",
"com.typesafe.slick" %% "slick" % "3.6.1",
"com.h2database" % "h2" % "2.1.214",
"com.mchange" % "c3p0" % "0.11.2"
Expand Down