Skip to content

Commit

Permalink
Bump AVRO version and remove NETTY (#57)
Browse files Browse the repository at this point in the history
* Bump avro version to address vulnerability CVE-2023-39410

* Remove netty deps
  • Loading branch information
nicmart authored Oct 11, 2023
1 parent ad77023 commit e7ba425
Showing 1 changed file with 3 additions and 25 deletions.
28 changes: 3 additions & 25 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import Dependencies.Versions.jacksonDatabindVersion
import Dependencies.Versions.jacksonVersion
import Dependencies.Versions.jimfsVersion
import Dependencies.Versions.nettyVersion
import Dependencies.Versions.nimbusJoseJwtVersion
import Dependencies._
import sbt._
Expand Down Expand Up @@ -42,7 +41,7 @@ object Dependencies {
val confluentVersion = "7.1.1"

val http4sVersion = "0.23.11"
val avroVersion = "1.11.0"
val avroVersion = "1.11.3"
val avro4sVersion = "4.0.13"

val catsVersion = "2.7.0"
Expand Down Expand Up @@ -71,8 +70,6 @@ object Dependencies {
val hadoopVersion = "3.3.4"
val woodstockVersion = "5.4.0"

val nettyVersion = "4.1.97.Final"

val nimbusJoseJwtVersion = "9.22"

val jimfsVersion = "1.2"
Expand Down Expand Up @@ -211,15 +208,6 @@ object Dependencies {
val connectApi = "org.apache.kafka" % "connect-api" % Versions.kafkaVersion
val slf4jApi = "org.slf4j" % "slf4j-api" % Versions.slf4jVersion

lazy val nettyCodecHttp: ModuleID = "io.netty" % "netty-codec-http" % nettyVersion
lazy val nettyCodecSocks: ModuleID = "io.netty" % "netty-codec-socks" % nettyVersion
lazy val nettyCodec: ModuleID = "io.netty" % "netty-codec" % nettyVersion
lazy val nettyCommon: ModuleID = "io.netty" % "netty-common" % nettyVersion
lazy val nettyHandlerProxy: ModuleID = "io.netty" % "netty-handler-proxy" % nettyVersion
lazy val nettyHandler: ModuleID = "io.netty" % "netty-handler" % nettyVersion
lazy val nettyResolver: ModuleID = "io.netty" % "netty-resolver" % nettyVersion
lazy val nettyTransport: ModuleID = "io.netty" % "netty-transport" % nettyVersion

lazy val jacksonCore: ModuleID = "com.fasterxml.jackson.core" % "jackson-core" % jacksonVersion
lazy val jacksonDatabind: ModuleID =
"com.fasterxml.jackson.core" % "jackson-databind" % jacksonDatabindVersion
Expand Down Expand Up @@ -284,16 +272,6 @@ trait Dependencies {
logback,
)

// override to the newest netty deps
val nettyDeps = Seq(nettyCodecHttp,
nettyCodecSocks,
nettyCodec,
nettyCommon,
nettyHandlerProxy,
nettyHandler,
nettyResolver,
nettyTransport,
)
val jacksonDeps = Seq(jacksonCore, jacksonModuleScala, jacksonDatabind, jacksonXml)

// Specific modules dependencies
Expand All @@ -315,7 +293,7 @@ trait Dependencies {
hadoopMapReduce,
woodstock,
jimfs,
) ++ enumeratum ++ circe ++ http4s ++ nettyDeps).map(_.exclude("org.slf4j", "slf4j-log4j12"))
) ++ enumeratum ++ circe ++ http4s).map(_.exclude("org.slf4j", "slf4j-log4j12"))
.map(_.exclude("org.apache.logging.log4j", "log4j-slf4j-impl"))
.map(_.exclude("com.sun.jersey", "*"))
.map(
Expand All @@ -327,7 +305,7 @@ trait Dependencies {
),
) ++ jacksonDeps

val emsSinkOverrides = jacksonDeps ++ nettyDeps ++ Seq(avro, nimbusJoseJwt)
val emsSinkOverrides = jacksonDeps ++ Seq(avro, nimbusJoseJwt)

// build plugins
val kindProjectorPlugin = addCompilerPlugin("org.typelevel" %% "kind-projector" % Versions.kindProjectorVersion)
Expand Down

0 comments on commit e7ba425

Please sign in to comment.