Browse Source

update finagle and finatra versions (#5213)

* update finagle and finatra versions

* exclude activation

* fewer typos

* different activation

* correct exclude syntax
Dave Rusek 5 years ago
parent
commit
2021b9d2ec
2 changed files with 4 additions and 3 deletions
  1. 1 1
      frameworks/Scala/finagle/build.sbt
  2. 3 2
      frameworks/Scala/finatra/build.sbt

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

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

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

@@ -1,4 +1,4 @@
-lazy val finatraVersion = "19.10.0"
+lazy val finatraVersion = "19.11.0"
 
 
 name := "techempower-benchmarks-finatra"
 name := "techempower-benchmarks-finatra"
 organization := "com.twitter"
 organization := "com.twitter"
@@ -18,7 +18,8 @@ assemblyMergeStrategy in assembly := {
 }
 }
 
 
 libraryDependencies ++= Seq(
 libraryDependencies ++= Seq(
-  "com.twitter" %% "finatra-http" % finatraVersion,
+  ("com.twitter" %% "finatra-http" % finatraVersion).
+    exclude("com.sun.activation", "javax.activation"),
   "org.slf4j" % "slf4j-nop" % "1.7.25",
   "org.slf4j" % "slf4j-nop" % "1.7.25",
   "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.9",
   "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.9",
 )
 )