Browse Source

Bump Finagle and Finatra versions (#5537)

* Update build.sbt

* Update build.sbt

* Update build.sbt
Yufan Gong 5 years ago
parent
commit
8b41196e59
2 changed files with 4 additions and 4 deletions
  1. 1 1
      frameworks/Scala/finagle/build.sbt
  2. 3 3
      frameworks/Scala/finatra/build.sbt

+ 1 - 1
frameworks/Scala/finagle/build.sbt

@@ -1,4 +1,4 @@
-lazy val finagleVersion = "20.1.0"
+lazy val finagleVersion = "20.3.0"
 
 
 name := "finagle-benchmark"
 name := "finagle-benchmark"
 scalaVersion := "2.12.8"
 scalaVersion := "2.12.8"

+ 3 - 3
frameworks/Scala/finatra/build.sbt

@@ -1,4 +1,4 @@
-lazy val finatraVersion = "20.1.0"
+lazy val finatraVersion = "20.3.0"
 
 
 name := "techempower-benchmarks-finatra"
 name := "techempower-benchmarks-finatra"
 organization := "com.twitter"
 organization := "com.twitter"
@@ -14,8 +14,8 @@ assemblyJarName in assembly := "finatra-benchmark.jar"
 assemblyMergeStrategy in assembly := {
 assemblyMergeStrategy in assembly := {
   case "BUILD" => MergeStrategy.discard
   case "BUILD" => MergeStrategy.discard
   case PathList("META-INF", "io.netty.versions.properties") => MergeStrategy.discard
   case PathList("META-INF", "io.netty.versions.properties") => MergeStrategy.discard
-  case other => MergeStrategy.defaultMergeStrategy(other)
-}
+  case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
+  case other => MergeStrategy.first}
 
 
 libraryDependencies ++= Seq(
 libraryDependencies ++= Seq(
   ("com.twitter" %% "finatra-http" % finatraVersion).
   ("com.twitter" %% "finatra-http" % finatraVersion).