Skip to content
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

Bump permissions client to v4, to pull in logging changes #4373

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Bump permissions client to v4, to pull in logging changes #4373

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e18287
Bump permissions client to v4, to pull in logging changes
bryophyta Nov 21, 2024
c588ba4
Bump logstash-logback-encoder
bryophyta Nov 21, 2024
8cd5400
add an explicit dependency on logback-classic, using the version requ…
andrew-nowak Nov 21, 2024
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: 4 additions & 4 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ val commonSettings = Seq(
"org.mockito" % "mockito-core" % "2.18.0" % Test,
"org.scalamock" %% "scalamock" % "5.1.0" % Test,
),
dependencyOverrides += "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.14.3",
dependencyOverrides += "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.17.2",

Compile / doc / sources := Seq.empty,
Compile / packageDoc / publishArtifact := false
Expand Down Expand Up @@ -75,7 +75,7 @@ val maybeBBCLib: Option[sbt.ProjectReference] = if(bbcBuildProcess) Some(bbcProj

lazy val commonLib = project("common-lib").settings(
libraryDependencies ++= Seq(
"com.gu" %% "editorial-permissions-client" % "3.0.0",
"com.gu" %% "editorial-permissions-client" % "4.0.0",
"com.gu" %% "pan-domain-auth-play_2-8" % "7.0.0",
"com.amazonaws" % "aws-java-sdk-iam" % awsSdkVersion,
"com.amazonaws" % "aws-java-sdk-s3" % awsSdkVersion,
Expand All @@ -94,7 +94,8 @@ lazy val commonLib = project("common-lib").settings(
"org.scalaz" %% "scalaz-core" % "7.3.8",
"org.im4java" % "im4java" % "1.4.0",
"com.gu" % "kinesis-logback-appender" % "1.4.4",
"net.logstash.logback" % "logstash-logback-encoder" % "5.0",
"net.logstash.logback" % "logstash-logback-encoder" % "7.4",
"ch.qos.logback" % "logback-classic" % "1.3.7", // this must be kept in sync with logstash-logback-encoder: see https://github.com/logfellow/logstash-logback-encoder/tree/main?tab=readme-ov-file#including-it-in-your-project for more
"com.typesafe.play" %% "play-logback" % "2.8.20", // needed when running the scripts
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.2",
"org.scalacheck" %% "scalacheck" % "1.14.0",
Expand All @@ -110,7 +111,6 @@ lazy val commonLib = project("common-lib").settings(
"org.yaml" % "snakeyaml" % "1.31",
"org.testcontainers" % "elasticsearch" % "1.19.2" % Test
),
dependencyOverrides += "ch.qos.logback" % "logback-classic" % "1.2.13" % Test
)

lazy val restLib = project("rest-lib").settings(
Expand Down
Loading