Skip to content

forced databind #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacum merged 3 commits into from
Mar 30, 2021
Merged

forced databind #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
626d328
forced databind
jacum Mar 30, 2021
532bb0f
bc
jacum Mar 30, 2021
4fbb39c
bc
jacum Mar 30, 2021
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
8 changes: 6 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ val commonSettings = Defaults.coreDefaultSettings ++ Seq(
maintainer in Docker := "The Bakery Team",
dockerRepository in Docker := sys.env.get("BAKERY_DOCKER_REPO"),
dockerBaseImage := "adoptopenjdk/openjdk11",
version in Docker := "local" // used by smoke tests for locally built images
version in Docker := "local", // used by smoke tests for locally built images
)

val dependencyOverrideSettings = Seq(
Expand All @@ -58,7 +58,11 @@ val dependencyOverrideSettings = Seq(
akkaActor,
akkaStream,
akkaProtobuf,
jnrConstants
jnrConstants,
snakeYaml,
jacksonDatabind,
bouncyCastleBcprov,
bouncyCastleBcpkix
)
)

Expand Down
5 changes: 5 additions & 0 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@ object Dependencies {
val springContext = "org.springframework" % "spring-context" % springVersion
val springCore = "org.springframework" % "spring-core" % springVersion

val snakeYaml = "org.yaml" % "snakeyaml" % "1.28"
val jacksonDatabind = "com.fasterxml.jackson.core" % "jackson-databind" % "2.11.4"
val bouncyCastleBcprov = "org.bouncycastle" % "bcprov-jdk15on" % "1.68"
val bouncyCastleBcpkix ="org.bouncycastle" % "bcpkix-jdk15on" % "1.68"

def scopeDeps(scope: String, modules: Seq[ModuleID]) = modules.map(m => m % scope)

def compileDeps(modules: ModuleID*) = modules.toSeq
Expand Down