Merge pull request #1733 from sxend/feature/update-akka-http

version up akka-http 1.0

frameworks/Scala/akka-http/build.sbt

@@ -9,9 +9,9 @@ scalaVersion := "2.11.6"
 resolvers += "Akka Snapshot Repository" at "http://repo.akka.io/snapshots/"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-http-core-experimental" % "1.0-RC2",
-  "com.typesafe.akka" %% "akka-http-scala-experimental" % "1.0-RC2",
-  "com.typesafe.akka" %% "akka-http-spray-json-experimental" % "1.0-RC2",
+  "com.typesafe.akka" %% "akka-http-core-experimental" % "1.0",
+  "com.typesafe.akka" %% "akka-http-experimental" % "1.0",
+  "com.typesafe.akka" %% "akka-http-spray-json-experimental" % "1.0",
   "mysql" % "mysql-connector-java" % "5.1.35",
   "org.apache.commons" % "commons-dbcp2" % "2.1",
   "org.scalatra.scalate" %% "scalate-core" % "1.7.0",

frameworks/Scala/akka-http/src/main/scala/com/typesafe/akka/http/benchmark/Bootstrap.scala

@@ -3,7 +3,7 @@ package com.typesafe.akka.http.benchmark
 import akka.actor.ActorSystem
 import akka.http.scaladsl.Http
 import akka.http.scaladsl.server.{Route, RoutingLog, RoutingSettings, RoutingSetup}
-import akka.stream.ActorFlowMaterializer
+import akka.stream.ActorMaterializer
 import akka.stream.scaladsl.Sink._
 import com.typesafe.config.Config
 
@@ -24,7 +24,7 @@ class BenchmarkBootstrap(components: {
   override def run(): Unit = {
 
     implicit val routingLog = RoutingLog(system.log)
-    implicit val materializer = ActorFlowMaterializer()
+    implicit val materializer = ActorMaterializer()
     implicit val settings = RoutingSettings.default(system)
     implicit val setup = RoutingSetup.apply
     val server = Http(components.system).bind(config.getString("akka.http.benchmark.host"), config.getInt("akka.http.benchmark.port"))