Set netty transitive dependency to 4.1.68.Final (close #502)

snowplow · Mar 4, 2022 · c17e37e · c17e37e
1 parent 313cbeb
commit c17e37e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/build.sbt b/build.sbt
@@ -61,6 +61,8 @@ lazy val common = project
       Dependencies.Libraries.schemaSniffer,
       Dependencies.Libraries.thrift,
       Dependencies.Libraries.sprayJson,
+      Dependencies.Libraries.nettyAll,
+      Dependencies.Libraries.nettyCodec,
       Dependencies.Libraries.specs2,
       Dependencies.Libraries.specs2Cats,
       Dependencies.Libraries.specs2Scalacheck,

diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -112,6 +112,8 @@ object BuildSettings {
       case x if x.endsWith(".json") => MergeStrategy.first
       case x if x.endsWith("AUTHORS") => MergeStrategy.first
       case x if x.endsWith(".config") => MergeStrategy.first
+      case x if x.endsWith(".types") => MergeStrategy.first
+      case x if x.contains("netty") => MergeStrategy.first
       case x =>
         val oldStrategy = (assembly / assemblyMergeStrategy).value
         oldStrategy(x)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -44,6 +44,7 @@ object Dependencies {
     val log4j            = "2.17.0" // CVE-2021-44228
     val thrift           = "0.15.0" // override transitive dependency to mitigate security vulnerabilities
     val sprayJson        = "1.3.6" // override transitive dependency to mitigate security vulnerabilities
+    val netty            = "4.1.68.Final" // override transitive dependency to mitigate security vulnerabilities
 
     val refererParser    = "1.1.0"
     val maxmindIplookups = "0.7.1"
@@ -137,6 +138,8 @@ object Dependencies {
     val iabClient        = "com.snowplowanalytics"      %  "iab-spiders-and-robots-client" % V.iabClient
     val thrift           = "org.apache.thrift"          %  "libthrift"                     % V.thrift
     val sprayJson        = "io.spray"                   %% "spray-json"                    % V.sprayJson
+    val nettyAll         = "io.netty"                   % "netty-all"                      % V.netty
+    val nettyCodec       = "io.netty"                   % "netty-codec"                    % V.netty
 
     val specs2           = "org.specs2"                 %% "specs2-core"                   % V.specs2                    % Test
     val specs2Cats       = "org.specs2"                 %% "specs2-cats"                   % V.specs2                    % Test