Merge branch 'wip-2.10.0-RC1-∂π'

akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala

@@ -18,7 +18,7 @@ import org.scalatest.{ BeforeAndAfterAll, WordSpec }
 import org.scalatest.matchers.MustMatchers
 import akka.testkit._
 import akka.util._
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.actor.Actor.Receive
 import scala.concurrent.Await
 
@@ -245,7 +245,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
   "using implicit timeout" in {
     val myActor = system.actorOf(Props(new FirstActor))
     //#using-implicit-timeout
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
     import akka.util.Timeout
     import akka.pattern.ask
     implicit val timeout = Timeout(5 seconds)
@@ -258,7 +258,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
   "using explicit timeout" in {
     val myActor = system.actorOf(Props(new FirstActor))
     //#using-explicit-timeout
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
     import akka.pattern.ask
     val future = myActor.ask("hello")(5 seconds)
     //#using-explicit-timeout
@@ -268,8 +268,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
   "using receiveTimeout" in {
     //#receive-timeout
     import akka.actor.ReceiveTimeout
-    import scala.concurrent.util.duration._
-    import scala.concurrent.util.Duration
+    import scala.concurrent.duration._
     class MyActor extends Actor {
       // To set an initial delay
       context.setReceiveTimeout(30 milliseconds)

akka-docs/rst/scala/code/docs/actor/FSMDocSpec.scala

@@ -15,7 +15,7 @@ class FSMDocSpec extends MyFavoriteTestFrameWorkPlusAkkaTestKit {
     //#fsm-code-elided
     //#simple-imports
     import akka.actor.{ Actor, ActorRef, FSM }
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
     //#simple-imports
     //#simple-events
     // received events

akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSample.scala

@@ -9,8 +9,7 @@ import language.postfixOps
 //#imports
 import akka.actor._
 import akka.actor.SupervisorStrategy._
-import scala.concurrent.util.duration._
-import scala.concurrent.util.Duration
+import scala.concurrent.duration._
 import akka.util.Timeout
 import akka.event.LoggingReceive
 import akka.pattern.{ ask, pipe }

akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSpec.scala

@@ -22,7 +22,7 @@ object FaultHandlingDocSpec {
     //#strategy
     import akka.actor.OneForOneStrategy
     import akka.actor.SupervisorStrategy._
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
 
     override val supervisorStrategy =
       OneForOneStrategy(maxNrOfRetries = 10, withinTimeRange = 1 minute) {
@@ -44,7 +44,7 @@ object FaultHandlingDocSpec {
     //#strategy2
     import akka.actor.OneForOneStrategy
     import akka.actor.SupervisorStrategy._
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
 
     override val supervisorStrategy =
       OneForOneStrategy(maxNrOfRetries = 10, withinTimeRange = 1 minute) {

akka-docs/rst/scala/code/docs/actor/SchedulerDocSpec.scala

@@ -8,7 +8,7 @@ import language.postfixOps
 //#imports1
 import akka.actor.Actor
 import akka.actor.Props
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 
 //#imports1
 

akka-docs/rst/scala/code/docs/actor/TypedActorDocSpec.scala

@@ -7,7 +7,7 @@ import language.postfixOps
 
 //#imports
 import scala.concurrent.{ Promise, Future, Await }
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.actor.{ ActorContext, TypedActor, TypedProps }
 
 //#imports

akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala

@@ -6,7 +6,7 @@ package docs.agent
 import language.postfixOps
 
 import akka.agent.Agent
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.util.Timeout
 import akka.testkit._
 
@@ -99,7 +99,7 @@ class AgentDocSpec extends AkkaSpec {
     val agent = Agent(0)
 
     //#read-await
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
     import akka.util.Timeout
 
     implicit val timeout = Timeout(5 seconds)
@@ -126,7 +126,7 @@ class AgentDocSpec extends AkkaSpec {
   "transfer example" in {
     //#transfer-example
     import akka.agent.Agent
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
     import akka.util.Timeout
     import scala.concurrent.stm._
 

akka-docs/rst/scala/code/docs/camel/Consumers.scala

@@ -59,7 +59,7 @@ object Consumers {
   object Sample4 {
     //#Consumer4
     import akka.camel.{ CamelMessage, Consumer }
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
 
     class Consumer4 extends Consumer {
       def endpointUri = "jetty:http://localhost:8877/camel/default"

akka-docs/rst/scala/code/docs/camel/Introduction.scala

@@ -79,7 +79,7 @@ object Introduction {
   {
     //#CamelActivation
     import akka.camel.{ CamelMessage, Consumer }
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
 
     class MyEndpoint extends Consumer {
       def endpointUri = "mina:tcp://localhost:6200?textline=true"

akka-docs/rst/scala/code/docs/camel/Producers.scala

@@ -17,7 +17,7 @@ object Producers {
     //#Producer1
     //#AskProducer
     import akka.pattern.ask
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
     implicit val timeout = Timeout(10 seconds)
 
     val system = ActorSystem("some-system")

akka-docs/rst/scala/code/docs/dataflow/DataflowDocSpec.scala

@@ -5,7 +5,7 @@ package docs.dataflow
 
 import language.postfixOps
 
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import scala.concurrent.{ Await, Future, Promise }
 import org.scalatest.WordSpec
 import org.scalatest.matchers.MustMatchers

akka-docs/rst/scala/code/docs/dispatcher/DispatcherDocSpec.scala

@@ -10,7 +10,7 @@ import org.scalatest.matchers.MustMatchers
 import akka.testkit.AkkaSpec
 import akka.event.Logging
 import akka.event.LoggingAdapter
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.actor.{ Props, Actor, PoisonPill, ActorSystem }
 
 object DispatcherDocSpec {

akka-docs/rst/scala/code/docs/extension/SettingsExtensionDocSpec.scala

@@ -8,7 +8,7 @@ import akka.actor.Extension
 import akka.actor.ExtensionId
 import akka.actor.ExtensionIdProvider
 import akka.actor.ExtendedActorSystem
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import com.typesafe.config.Config
 import java.util.concurrent.TimeUnit
 

akka-docs/rst/scala/code/docs/future/FutureDocSpec.scala

@@ -9,7 +9,7 @@ import akka.testkit._
 import akka.actor.{ Actor, Props }
 import akka.actor.Status
 import akka.util.Timeout
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import java.lang.IllegalStateException
 import scala.concurrent.{ Await, ExecutionContext, Future, Promise }
 import scala.util.{ Failure, Success }
@@ -62,7 +62,7 @@ class FutureDocSpec extends AkkaSpec {
     import scala.concurrent.Await
     import akka.pattern.ask
     import akka.util.Timeout
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
 
     implicit val timeout = Timeout(5 seconds)
     val future = actor ? msg // enabled by the “ask” import
@@ -88,7 +88,7 @@ class FutureDocSpec extends AkkaSpec {
     //#future-eval
     import scala.concurrent.Await
     import scala.concurrent.Future
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
 
     val future = Future {
       "Hello" + "World"

akka-docs/rst/scala/code/docs/pattern/SchedulerPatternSpec.scala

@@ -7,8 +7,7 @@ package docs.pattern
 import language.postfixOps
 
 import akka.actor.{ Props, ActorRef, Actor }
-import scala.concurrent.util.duration._
-import scala.concurrent.util.{ FiniteDuration, Duration }
+import scala.concurrent.duration._
 import akka.testkit.{ TimingTest, AkkaSpec, filterException }
 import docs.pattern.SchedulerPatternSpec.ScheduleInConstructor
 

akka-docs/rst/scala/code/docs/routing/RouterTypeExample.scala

@@ -8,7 +8,7 @@ import language.postfixOps
 import akka.routing.{ ScatterGatherFirstCompletedRouter, BroadcastRouter, RandomRouter, RoundRobinRouter }
 import annotation.tailrec
 import akka.actor.{ Props, Actor }
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.util.Timeout
 import scala.concurrent.Await
 import akka.pattern.ask

akka-docs/rst/scala/code/docs/testkit/TestKitUsageSpec.scala

@@ -21,7 +21,7 @@ import akka.actor.Props
 import akka.testkit.DefaultTimeout
 import akka.testkit.ImplicitSender
 import akka.testkit.TestKit
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 
 /**
  * a Test to show some TestKit examples

akka-docs/rst/scala/code/docs/testkit/TestkitDocSpec.scala

@@ -8,7 +8,7 @@ import scala.util.Success
 
 //#imports-test-probe
 import akka.testkit.TestProbe
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.actor._
 import scala.concurrent.Future
 
@@ -89,7 +89,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
     //#test-fsm-ref
     import akka.testkit.TestFSMRef
     import akka.actor.FSM
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
 
     val fsm = TestFSMRef(new Actor with FSM[Int, String] {
       startWith(1, "")
@@ -122,7 +122,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
 
     //#test-behavior
     import akka.testkit.TestActorRef
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
     import scala.concurrent.Await
     import akka.pattern.ask
 
@@ -161,7 +161,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
     type Worker = MyActor
     //#test-within
     import akka.actor.Props
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
 
     val worker = system.actorOf(Props[Worker])
     within(200 millis) {
@@ -175,7 +175,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
 
   "demonstrate dilated duration" in {
     //#duration-dilation
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
     import akka.testkit._
     10.milliseconds.dilated
     //#duration-dilation
@@ -208,7 +208,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
 
   "demonstrate probe reply" in {
     import akka.testkit.TestProbe
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
     import akka.pattern.ask
     //#test-probe-reply
     val probe = TestProbe()

akka-docs/rst/scala/code/docs/transactor/TransactorDocSpec.scala

@@ -8,7 +8,7 @@ import language.postfixOps
 
 import akka.actor._
 import akka.transactor._
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.util.Timeout
 import akka.testkit._
 import scala.concurrent.stm._
@@ -141,7 +141,7 @@ class TransactorDocSpec extends AkkaSpec {
 
     //#run-coordinated-example
     import scala.concurrent.Await
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
     import akka.util.Timeout
     import akka.pattern.ask
 
@@ -168,7 +168,7 @@ class TransactorDocSpec extends AkkaSpec {
     import CoordinatedApi._
 
     //#implicit-timeout
-    import scala.concurrent.util.duration._
+    import scala.concurrent.duration._
     import akka.util.Timeout
 
     implicit val timeout = Timeout(5 seconds)

akka-docs/rst/scala/code/docs/zeromq/ZeromqDocSpec.scala

@@ -6,7 +6,7 @@ package docs.zeromq
 import language.postfixOps
 
 import akka.actor.{ Actor, Props }
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.testkit._
 import akka.zeromq.{ ZeroMQVersion, ZeroMQExtension }
 import java.text.SimpleDateFormat