Skip to content

Commit

Permalink
Merge pull request #10806 from playframework/bump-akka-2614
Browse files Browse the repository at this point in the history
Bump akka 2.6.14
  • Loading branch information
mergify[bot] committed Apr 8, 2021
2 parents 30e9a2d + 141f12f commit 8a2c00a
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Keys._
import buildinfo.BuildInfo

object Dependencies {
val akkaVersion: String = sys.props.getOrElse("akka.version", "2.6.13")
val akkaVersion: String = sys.props.getOrElse("akka.version", "2.6.14")
val akkaHttpVersion = "10.1.14"

val sslConfig = "com.typesafe" %% "ssl-config-core" % "0.4.2"
Expand Down Expand Up @@ -44,11 +44,7 @@ object Dependencies {
"com.fasterxml.jackson.core" % "jackson-core",
"com.fasterxml.jackson.core" % "jackson-annotations",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310",
// Explicit dependency to align versions
"com.fasterxml.jackson.module" %% "jackson-module-scala",
"com.fasterxml.jackson.module" % "jackson-module-parameter-names",
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-cbor",
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310"
).map(_ % jacksonVersion) ++ jacksonDatabind

val playJson = "com.typesafe.play" %% "play-json" % playJsonVersion
Expand Down

0 comments on commit 8a2c00a

Please sign in to comment.