瀏覽代碼

Update finatra's dependencies (#3124)

This makes finatra compatible with Java 9.
Michael Hixson 7 年之前
父節點
當前提交
903258103d

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

@@ -2,7 +2,7 @@ name := "techempower-benchmarks-finatra"
 organization := "com.twitter"
 version := "2.11.0"
 
-scalaVersion := "2.11.11"
+scalaVersion := "2.12.4"
 
 resolvers ++= Seq(
   Resolver.sonatypeRepo("releases")
@@ -16,6 +16,7 @@ assemblyMergeStrategy in assembly := {
 }
 
 libraryDependencies ++= Seq(
-  "com.twitter" %% "finatra-http" % "2.11.0",
-  "org.slf4j" % "slf4j-nop" % "1.7.21"
+  "com.twitter" %% "finatra-http" % "17.11.0",
+  "org.slf4j" % "slf4j-nop" % "1.7.25",
+  "javax.activation" % "activation" % "1.1.1"
 )

+ 1 - 1
frameworks/Scala/finatra/project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.16
+sbt.version=1.0.4

+ 1 - 1
frameworks/Scala/finatra/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.13.0")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")

+ 1 - 1
frameworks/Scala/finatra/setup.sh

@@ -4,4 +4,4 @@ fw_depends java sbt
 
 sbt clean assembly -batch
 
-java -Dcom.twitt.finagle.netty4.numWorkers=1 -Dcom.twitter.util.events.sinkEnabled=false -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -jar target/scala-2.11/finatra-benchmark.jar -log.level=ERROR -http.response.charset.enabled=false
+java -Dcom.twitt.finagle.netty4.numWorkers=1 -Dcom.twitter.util.events.sinkEnabled=false -server -XX:+UseNUMA -XX:+UseParallelGC -XX:+AggressiveOpts -jar target/scala-2.12/finatra-benchmark.jar -log.level=ERROR -http.response.charset.enabled=false