From aaaf72c2addd78e5b9b7b0243626233db2cc509c Mon Sep 17 00:00:00 2001 From: John Duffell Date: Thu, 10 Oct 2019 15:22:31 +0100 Subject: [PATCH] update jackson and scala versions --- build.sbt | 10 +++++----- project/build.properties | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index ed155d254..6d69fe1ad 100644 --- a/build.sbt +++ b/build.sbt @@ -37,11 +37,11 @@ lazy val root = (project in file(".")).enablePlugins( "com.gu.memsub.Subscription.ProductRatePlanId" )) -scalaVersion := "2.12.6" +scalaVersion := "2.12.10" scalacOptions ++= Seq("-feature") val scalatestVersion = "3.0.4" -val jacksonVersion = "2.9.9" +val jacksonVersion = "2.10.0" libraryDependencies ++= Seq( cache, @@ -56,7 +56,7 @@ libraryDependencies ++= Seq( "com.gu" %% "identity-test-users" % "0.6", "com.gu" %% "content-authorisation-common" % "0.4", "com.gu" %% "tip" % "0.1.1", - "com.gu" %% "acquisition-event-producer-play26" % "4.0.17", + "com.gu" %% "acquisition-event-producer-play26" % "4.0.22", "com.github.nscala-time" %% "nscala-time" % "2.16.0", "io.sentry" % "sentry-logback" % "1.7.5", "com.typesafe.scala-logging" %% "scala-logging" % "3.7.2", @@ -72,9 +72,9 @@ libraryDependencies ++= Seq( "com.amazonaws" % "aws-java-sdk-sqs" % "1.11.564", "com.gu" % "kinesis-logback-appender" % "1.4.2", "net.logstash.logback" % "logstash-logback-encoder" % "4.11", - "com.fasterxml.jackson.dataformat" % "jackson-dataformat-cbor" % "2.9.2", + "com.fasterxml.jackson.dataformat" % "jackson-dataformat-cbor" % jacksonVersion, "com.google.guava" % "guava" % "25.0-jre", //-- added explicitly - snyk report avoid logback vulnerability - "com.fasterxml.jackson.core" % "jackson-databind" % (jacksonVersion+".1"), //added explicitly to avoid snyk vulnerability + "com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion, //added explicitly to avoid snyk vulnerability "com.fasterxml.jackson.core" % "jackson-annotations" % jacksonVersion, //added explicitly to avoid snyk vulnerability "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % jacksonVersion, //added explicitly to avoid snyk vulnerability "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % jacksonVersion, //added explicitly to avoid snyk vulnerability diff --git a/project/build.properties b/project/build.properties index c0bab0494..8522443de 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.8 +sbt.version=1.3.2