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

akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java

@@ -7,7 +7,7 @@ import akka.japi.*;
 import scala.concurrent.Await;
 import scala.concurrent.Future;
 import scala.concurrent.Promise;
-import scala.concurrent.util.Duration;
+import scala.concurrent.duration.Duration;
 import akka.testkit.TestKitExtension;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;

akka-actor-tests/src/test/java/akka/util/JavaDuration.java

@@ -4,14 +4,14 @@
 package akka.util;
 
 import org.junit.Test;
-import scala.concurrent.util.Duration;
+import scala.concurrent.duration.Duration;
 
 public class JavaDuration {
 
   @Test
   public void testCreation() {
     final Duration fivesec = Duration.create(5, "seconds");
-    final Duration threemillis = Duration.parse("3 millis");
+    final Duration threemillis = Duration.create("3 millis");
     final Duration diff = fivesec.minus(threemillis);
     assert diff.lt(fivesec);
     assert Duration.Zero().lteq(Duration.Inf());

akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala

@@ -8,7 +8,7 @@ import language.postfixOps
 import akka.testkit._
 import akka.testkit.DefaultTimeout
 import akka.testkit.TestEvent._
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.routing._
 import org.scalatest.BeforeAndAfterEach
 import akka.ConfigurationException

akka-actor-tests/src/test/scala/akka/actor/ActorDSLSpec.scala

@@ -12,7 +12,7 @@ import akka.actor.ActorDSL._
 //#import
 import akka.event.Logging.Warning
 import scala.concurrent.{ Await, Future }
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import java.util.concurrent.TimeoutException
 
 class ActorDSLSpec extends AkkaSpec {

akka-actor-tests/src/test/scala/akka/actor/ActorFireForgetRequestReplySpec.scala

@@ -6,7 +6,7 @@ package akka.actor
 
 import akka.testkit._
 import org.scalatest.BeforeAndAfterEach
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import scala.concurrent.Await
 import akka.pattern.ask
 

akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala

@@ -11,7 +11,7 @@ import org.scalatest.matchers.MustMatchers
 
 import akka.actor.Actor._
 import akka.testkit._
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import java.util.concurrent.atomic._
 import scala.concurrent.Await
 import akka.pattern.ask

akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala

@@ -6,7 +6,7 @@ package akka.actor
 import language.postfixOps
 
 import akka.testkit._
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import scala.concurrent.Await
 import akka.pattern.ask
 import java.net.MalformedURLException

akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala

@@ -11,7 +11,7 @@ import org.scalatest.matchers.MustMatchers
 
 import akka.testkit._
 import akka.util.Timeout
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import scala.concurrent.Await
 import java.lang.IllegalStateException
 import scala.concurrent.Promise

akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala

@@ -8,7 +8,7 @@ import akka.testkit._
 import org.scalatest.junit.JUnitSuite
 import com.typesafe.config.ConfigFactory
 import scala.concurrent.Await
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import scala.collection.JavaConverters
 import java.util.concurrent.{ TimeUnit, RejectedExecutionException, CountDownLatch, ConcurrentLinkedQueue }
 import akka.util.Timeout

akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala

@@ -3,7 +3,7 @@
  */
 package akka.actor
 
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.testkit._
 import akka.testkit.TestEvent._
 import scala.concurrent.Await

akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala

@@ -11,7 +11,7 @@ import akka.testkit.TestEvent._
 import akka.dispatch.BoundedDequeBasedMailbox
 import akka.pattern.ask
 import scala.concurrent.Await
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.actor.ActorSystem.Settings
 import com.typesafe.config.{ Config, ConfigFactory }
 import org.scalatest.Assertions.intercept

akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala

@@ -10,7 +10,7 @@ import akka.testkit.DefaultTimeout
 import akka.testkit.TestEvent._
 import scala.concurrent.Await
 import akka.pattern.ask
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import com.typesafe.config.{ Config, ConfigFactory }
 import org.scalatest.BeforeAndAfterEach
 import org.scalatest.junit.JUnitSuite

akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala

@@ -4,7 +4,7 @@ import language.postfixOps
 
 import akka.testkit.AkkaSpec
 import akka.dispatch.UnboundedMailbox
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 
 object ConsistencySpec {
   val config = """

akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala

@@ -6,7 +6,7 @@ package akka.actor
 
 import language.postfixOps
 import akka.testkit._
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import java.util.concurrent.atomic._
 import scala.concurrent.Await
 import akka.pattern.ask

akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala

@@ -10,7 +10,7 @@ import akka.testkit.AkkaSpec
 import com.typesafe.config.ConfigFactory
 import com.typesafe.config.ConfigParseOptions
 import akka.routing._
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 
 object DeployerSpec {
   val deployerConf = ConfigFactory.parseString("""

akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala

@@ -8,13 +8,11 @@ import language.postfixOps
 import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach }
 import akka.testkit._
 import TestEvent.Mute
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.event._
 import com.typesafe.config.ConfigFactory
 import scala.concurrent.Await
 import akka.util.Timeout
-import scala.concurrent.util.Duration
-import scala.concurrent.util.FiniteDuration
 
 object FSMActorSpec {
   val timeout = Timeout(2 seconds)

akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala

@@ -7,8 +7,7 @@ package akka.actor
 import language.postfixOps
 
 import akka.testkit._
-import scala.concurrent.util.Duration
+import scala.concurrent.duration._
-import scala.concurrent.util.duration._
 import akka.event.Logging
 
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])

akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala

@@ -6,8 +6,7 @@ package akka.actor
 import language.postfixOps
 
 import akka.testkit._
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
-import scala.concurrent.util.Duration
 
 object FSMTransitionSpec {
 

akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala

@@ -7,9 +7,8 @@ package akka.actor
 import language.postfixOps
 
 import akka.testkit._
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.actor.Actor._
-import scala.concurrent.util.Duration
 import scala.concurrent.Await
 import akka.pattern.{ ask, pipe }
 

akka-actor-tests/src/test/scala/akka/actor/IOActor.scala

@@ -7,8 +7,7 @@ package akka.actor
 import language.postfixOps
 import akka.util.ByteString
 import scala.concurrent.{ ExecutionContext, Await, Future, Promise }
-import scala.concurrent.util.{ Duration, Deadline }
+import scala.concurrent.duration._
-import scala.concurrent.util.duration._
 import scala.util.continuations._
 import akka.testkit._
 import akka.dispatch.MessageDispatcher
@@ -16,7 +15,6 @@ import akka.pattern.ask
 import java.net.{ Socket, InetSocketAddress, InetAddress, SocketAddress }
 import scala.util.Failure
 import annotation.tailrec
-import scala.concurrent.util.FiniteDuration
 
 object IOActorSpec {
 

akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala

@@ -7,7 +7,7 @@ package akka.actor
 import language.postfixOps
 import akka.testkit._
 import scala.concurrent.Await
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.util.Timeout
 import scala.concurrent.Future
 import scala.util.Success

akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala

@@ -6,11 +6,10 @@ package akka.actor
 
 import language.postfixOps
 import akka.testkit._
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import java.util.concurrent.atomic.AtomicInteger
 import scala.concurrent.Await
 import java.util.concurrent.TimeoutException
-import scala.concurrent.util.Duration
 
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
 class ReceiveTimeoutSpec extends AkkaSpec {

akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala

@@ -15,8 +15,7 @@ import java.util.concurrent.{ TimeUnit, CountDownLatch }
 import akka.testkit.AkkaSpec
 import akka.testkit.DefaultTimeout
 import akka.testkit.TestLatch
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
-import scala.concurrent.util.Duration
 import akka.pattern.ask
 
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])

akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala

@@ -3,7 +3,7 @@ package akka.actor
 import language.postfixOps
 
 import org.scalatest.BeforeAndAfterEach
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import java.util.concurrent.{ CountDownLatch, ConcurrentLinkedQueue, TimeUnit }
 import akka.testkit._
 import scala.concurrent.Await

akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala

@@ -7,8 +7,7 @@ package akka.actor
 import language.postfixOps
 import java.util.concurrent.{ TimeUnit, CountDownLatch }
 import scala.concurrent.Await
-import scala.concurrent.util.Duration
+import scala.concurrent.duration._
-import scala.concurrent.util.duration.intToDurationInt
 import scala.math.BigInt.int2bigInt
 import scala.util.Random
 import scala.util.control.NoStackTrace

akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala

@@ -12,7 +12,7 @@ import java.util.concurrent.{ TimeUnit, CountDownLatch }
 import akka.testkit.AkkaSpec
 import akka.testkit.DefaultTimeout
 import akka.pattern.ask
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import scala.util.control.NonFatal
 
 object SupervisorMiscSpec {

akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala

@@ -7,7 +7,7 @@ package akka.actor
 import language.postfixOps
 
 import org.scalatest.BeforeAndAfterEach
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.{ Die, Ping }
 import akka.testkit.TestEvent._
 import akka.testkit._

akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala

@@ -8,7 +8,7 @@ import language.postfixOps
 import org.scalatest.WordSpec
 import org.scalatest.matchers.MustMatchers
 import scala.concurrent.Await
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.actor.Actor._
 import akka.testkit.{ TestKit, EventFilter, filterEvents, filterException, AkkaSpec, ImplicitSender, DefaultTimeout }
 import akka.dispatch.Dispatchers

akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala

@@ -14,7 +14,7 @@ import akka.testkit.ImplicitSender
 import akka.testkit.DefaultTimeout
 import scala.concurrent.Await
 import akka.pattern.ask
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
 class Ticket669Spec extends AkkaSpec with BeforeAndAfterAll with ImplicitSender with DefaultTimeout {

akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala

@@ -7,8 +7,7 @@ import language.postfixOps
 import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach }
 import akka.util.Timeout
 import scala.concurrent.{ Await, Future, Promise }
-import scala.concurrent.util.Duration
+import scala.concurrent.duration._
-import scala.concurrent.util.duration._
 import java.util.concurrent.atomic.AtomicReference
 import annotation.tailrec
 import akka.testkit.{ EventFilter, filterEvents, AkkaSpec }
@@ -20,7 +19,6 @@ import akka.serialization.JavaSerializer
 import akka.actor.TypedActor._
 import java.lang.IllegalStateException
 import java.util.concurrent.{ TimeoutException, TimeUnit, CountDownLatch }
-import scala.concurrent.util.FiniteDuration
 
 object TypedActorSpec {
 

akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala

@@ -21,8 +21,7 @@ import akka.event.Logging.Error
 import akka.pattern.ask
 import akka.testkit._
 import akka.util.Switch
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
-import scala.concurrent.util.Duration
 import scala.concurrent.{ Await, Future, Promise }
 import scala.annotation.tailrec
 

akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala

@@ -7,8 +7,7 @@ import java.util.concurrent.atomic.{ AtomicBoolean, AtomicInteger }
 import akka.testkit.{ filterEvents, EventFilter, AkkaSpec }
 import akka.actor.{ Props, Actor }
 import scala.concurrent.Await
-import scala.concurrent.util.Duration
+import scala.concurrent.duration._
-import scala.concurrent.util.duration._
 import akka.testkit.DefaultTimeout
 import akka.dispatch.{ PinnedDispatcher, Dispatchers, Dispatcher }
 import akka.pattern.ask

akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala

@@ -14,7 +14,7 @@ import scala.collection.JavaConverters._
 import com.typesafe.config.ConfigFactory
 import akka.actor.Actor
 import akka.actor.Props
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 
 object DispatchersSpec {
   val config = """

akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala

@@ -9,8 +9,7 @@ import language.postfixOps
 import akka.testkit.AkkaSpec
 import com.typesafe.config.ConfigFactory
 import scala.collection.JavaConverters._
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
-import scala.concurrent.util.Duration
 import akka.actor.{ IOManager, ActorSystem }
 
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])

akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala

@@ -8,7 +8,7 @@ import language.postfixOps
 import akka.actor.{ Actor, Props }
 import scala.concurrent.Future
 import scala.concurrent.Await
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.testkit.{ AkkaSpec, DefaultTimeout }
 import akka.pattern.{ ask, pipe }
 import scala.concurrent.ExecutionException

akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala

@@ -12,8 +12,7 @@ import akka.actor._
 import akka.testkit.{ EventFilter, filterEvents, filterException, AkkaSpec, DefaultTimeout, TestLatch }
 import scala.concurrent.{ Await, Awaitable, Future, Promise, ExecutionContext }
 import scala.util.control.NonFatal
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
-import scala.concurrent.util.Duration
 import scala.concurrent.ExecutionContext
 import org.scalatest.junit.JUnitSuite
 import scala.runtime.NonLocalReturnControl

akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala

@@ -11,7 +11,7 @@ import com.typesafe.config.Config
 import akka.actor.{ RepointableRef, Props, DeadLetter, ActorSystem, ActorRefWithCell, ActorRef, ActorCell }
 import akka.testkit.AkkaSpec
 import scala.concurrent.{ Future, Promise, Await }
-import scala.concurrent.util.duration.intToDurationInt
+import scala.concurrent.duration._
 
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
 abstract class MailboxSpec extends AkkaSpec with BeforeAndAfterAll with BeforeAndAfterEach {

akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala

@@ -10,7 +10,7 @@ import akka.actor.{ Props, InternalActorRef, ActorSystem, Actor }
 import akka.pattern.ask
 import akka.testkit.{ DefaultTimeout, AkkaSpec }
 import scala.concurrent.Await
-import scala.concurrent.util.duration.intToDurationInt
+import scala.concurrent.duration._
 
 object PriorityDispatcherSpec {
   val config = """

akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala

@@ -8,7 +8,7 @@ import language.postfixOps
 
 import org.scalatest.BeforeAndAfterEach
 import akka.testkit._
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import java.util.concurrent.atomic._
 import akka.actor.{ Props, Actor, ActorRef, ActorSystem }
 import java.util.Comparator

akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala

@@ -5,7 +5,7 @@ package akka.event
 
 import language.postfixOps
 
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.actor.{ Actor, ActorRef, ActorSystemImpl, ActorSystem, Props, UnhandledMessage }
 import com.typesafe.config.ConfigFactory
 import scala.collection.JavaConverters._
@@ -282,4 +282,4 @@ class EventStreamSpec extends AkkaSpec(EventStreamSpec.config) {
     msg foreach (expectMsg(_))
   }
 
-}
+}

akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala

@@ -6,10 +6,9 @@ package akka.event
 import language.postfixOps
 
 import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach }
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.testkit._
 import org.scalatest.WordSpec
-import scala.concurrent.util.Duration
 import com.typesafe.config.ConfigFactory
 import scala.collection.JavaConverters._
 import java.util.Properties

akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala

@@ -6,7 +6,7 @@ package akka.pattern
 import language.postfixOps
 
 import akka.testkit.AkkaSpec
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import scala.concurrent.Await
 import akka.testkit.DefaultTimeout
 import akka.util.Timeout

akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala

@@ -4,7 +4,7 @@
 package akka.pattern
 
 import akka.testkit._
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import scala.concurrent.{ Promise, Future, Await }
 
 class CircuitBreakerMTSpec extends AkkaSpec {

akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala

@@ -6,7 +6,7 @@ package akka.pattern
 
 import language.postfixOps
 
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.testkit._
 import org.scalatest.BeforeAndAfter
 import akka.actor.{ ActorSystem, Scheduler }

akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala

@@ -9,8 +9,7 @@ import language.postfixOps
 import akka.testkit.AkkaSpec
 import akka.actor.{ Props, Actor }
 import scala.concurrent.{ Future, Promise, Await }
-import scala.concurrent.util.Duration
+import scala.concurrent.duration._
-import scala.concurrent.util.duration._
 
 object PatternSpec {
   case class Work(duration: Duration)

akka-actor-tests/src/test/scala/akka/performance/microbench/TellThroughputComputationPerformanceSpec.scala

@@ -4,8 +4,7 @@ import akka.performance.workbench.PerformanceSpec
 import akka.actor._
 import java.util.concurrent.{ ThreadPoolExecutor, CountDownLatch, TimeUnit }
 import akka.dispatch._
-import scala.concurrent.util.Duration
+import scala.concurrent.duration._
-import scala.concurrent.util.duration._
 
 // -server -Xms512M -Xmx1024M -XX:+UseParallelGC -Dbenchmark=true -Dbenchmark.repeatFactor=500
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])

akka-actor-tests/src/test/scala/akka/performance/microbench/TellThroughputPerformanceSpec.scala

@@ -4,8 +4,7 @@ import akka.performance.workbench.PerformanceSpec
 import akka.actor._
 import java.util.concurrent.{ ThreadPoolExecutor, CountDownLatch, TimeUnit }
 import akka.dispatch._
-import scala.concurrent.util.Duration
+import scala.concurrent.duration._
-import scala.concurrent.util.duration._
 
 // -server -Xms512M -Xmx1024M -XX:+UseParallelGC -Dbenchmark=true -Dbenchmark.repeatFactor=500
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])

akka-actor-tests/src/test/scala/akka/performance/workbench/PerformanceSpec.scala

@@ -4,7 +4,7 @@ import scala.collection.immutable.TreeMap
 import org.apache.commons.math.stat.descriptive.DescriptiveStatistics
 import org.scalatest.BeforeAndAfterEach
 import akka.testkit.AkkaSpec
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import com.typesafe.config.Config
 import java.util.concurrent.TimeUnit
 import akka.event.Logging

akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala

@@ -12,7 +12,7 @@ import akka.ConfigurationException
 import scala.concurrent.Await
 import akka.pattern.{ ask, gracefulStop }
 import akka.testkit.{ TestLatch, ImplicitSender, DefaultTimeout, AkkaSpec }
-import scala.concurrent.util.duration.intToDurationInt
+import scala.concurrent.duration._
 import akka.actor.UnstartedCell
 
 object ConfiguredLocalRoutingSpec {

akka-actor-tests/src/test/scala/akka/routing/CustomRouteSpec.scala

@@ -35,7 +35,7 @@ class CustomRouteSpec extends AkkaSpec {
       import akka.pattern.ask
       import akka.testkit.ExtractRoute
       import scala.concurrent.Await
-      import scala.concurrent.util.duration._
+      import scala.concurrent.duration._
 
       val target = system.actorOf(Props.empty)
       val router = system.actorOf(Props.empty.withRouter(new MyRouter(target)))

akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala

@@ -9,13 +9,11 @@ import akka.testkit._
 import akka.testkit.TestEvent._
 import akka.actor.Props
 import scala.concurrent.Await
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import akka.actor.ActorRef
 import java.util.concurrent.atomic.AtomicInteger
 import akka.pattern.ask
-import scala.concurrent.util.Duration
 import java.util.concurrent.TimeoutException
-import scala.concurrent.util.FiniteDuration
 import scala.util.Try
 
 object ResizerSpec {
@@ -162,7 +160,7 @@ class ResizerSpec extends AkkaSpec(ResizerSpec.config) with DefaultTimeout with
           // sending in too quickly will result in skipped resize due to many resizeInProgress conflicts
           Thread.sleep(20.millis.dilated.toMillis)
         }
-        within((((d * loops).asInstanceOf[FiniteDuration] / resizer.lowerBound) + 2.seconds.dilated).asInstanceOf[FiniteDuration]) {
+        within((d * loops / resizer.lowerBound) + 2.seconds.dilated) {
           for (m ← 0 until loops) expectMsg("done")
         }
       }

akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala

@@ -9,9 +9,8 @@ import java.util.concurrent.atomic.AtomicInteger
 import akka.actor._
 import scala.collection.mutable.LinkedList
 import akka.testkit._
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import scala.concurrent.Await
-import scala.concurrent.util.Duration
 import akka.ConfigurationException
 import com.typesafe.config.ConfigFactory
 import akka.pattern.{ ask, pipe }

akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala

@@ -11,7 +11,7 @@ import akka.actor._
 import java.io._
 import scala.concurrent.Await
 import akka.util.Timeout
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import scala.reflect.BeanInfo
 import com.google.protobuf.Message
 import akka.pattern.ask

akka-actor-tests/src/test/scala/akka/util/DurationSpec.scala

@@ -7,8 +7,7 @@ import language.postfixOps
 
 import org.scalatest.WordSpec
 import org.scalatest.matchers.MustMatchers
-import scala.concurrent.util.Duration
+import scala.concurrent.duration._
-import scala.concurrent.util.duration._
 
 import java.util.concurrent.TimeUnit._
 
@@ -34,11 +33,12 @@ class DurationSpec extends WordSpec with MustMatchers {
       val one = 1.second
       val inf = Duration.Inf
       val minf = Duration.MinusInf
+      val undefined = Duration.Undefined
       (-inf) must be(minf)
-      intercept[IllegalArgumentException] { minf + inf }
+      (minf + inf) must be(undefined)
-      intercept[IllegalArgumentException] { inf - inf }
+      (inf - inf) must be(undefined)
-      intercept[IllegalArgumentException] { inf + minf }
+      (inf + minf) must be(undefined)
-      intercept[IllegalArgumentException] { minf - minf }
+      (minf - minf) must be(undefined)
       (inf + inf) must be(inf)
       (inf - minf) must be(inf)
       (minf - inf) must be(minf)

akka-actor/src/main/java/akka/util/internal/HashedWheelTimer.java

@@ -24,8 +24,8 @@ import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import scala.concurrent.util.Duration;
+import scala.concurrent.duration.Duration;
-import scala.concurrent.util.FiniteDuration;
+import scala.concurrent.duration.FiniteDuration;
 import akka.event.LoggingAdapter;
 import akka.util.Unsafe;
 

akka-actor/src/main/java/akka/util/internal/Timer.java

@@ -17,7 +17,7 @@ package akka.util.internal;
 
 import java.util.Set;
 
-import scala.concurrent.util.FiniteDuration;
+import scala.concurrent.duration.FiniteDuration;
 
 /**
  * Schedules {@link TimerTask}s for one-time future execution in a background

akka-actor/src/main/scala/akka/actor/ActorCell.scala

@@ -7,7 +7,7 @@ package akka.actor
 import java.io.{ ObjectOutputStream, NotSerializableException }
 import scala.annotation.tailrec
 import scala.collection.immutable.TreeSet
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import scala.util.control.NonFatal
 import akka.actor.dungeon.ChildrenContainer
 import akka.actor.dungeon.ChildrenContainer.WaitingForChildren

akka-actor/src/main/scala/akka/actor/ActorDSL.scala

@@ -5,13 +5,11 @@
 package akka.actor
 
 import scala.collection.mutable.Queue
-import scala.concurrent.util.Duration
+import scala.concurrent.duration._
-import scala.concurrent.util.duration._
 import akka.pattern.ask
 import scala.concurrent.Await
 import akka.util.Timeout
 import scala.collection.immutable.TreeSet
-import scala.concurrent.util.Deadline
 import java.util.concurrent.TimeoutException
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.TimeUnit

akka-actor/src/main/scala/akka/actor/ActorSystem.scala

@@ -9,7 +9,7 @@ import akka.dispatch._
 import akka.pattern.ask
 import com.typesafe.config.{ Config, ConfigFactory }
 import scala.annotation.tailrec
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import java.io.Closeable
 import scala.concurrent.{ Await, Awaitable, CanAwait, Future }
 import scala.util.control.NonFatal
@@ -18,7 +18,7 @@ import akka.util.internal.{ HashedWheelTimer, ConcurrentIdentityHashMap }
 import java.util.concurrent.{ ThreadFactory, CountDownLatch, TimeoutException, RejectedExecutionException }
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import akka.actor.dungeon.ChildrenContainer
-import scala.concurrent.util.FiniteDuration
+import scala.concurrent.duration.FiniteDuration
 import util.{ Failure, Success }
 
 object ActorSystem {

akka-actor/src/main/scala/akka/actor/Deployer.scala

@@ -4,7 +4,7 @@
 
 package akka.actor
 
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import com.typesafe.config._
 import akka.routing._
 import java.util.concurrent.{ TimeUnit }

akka-actor/src/main/scala/akka/actor/FSM.scala

@@ -5,10 +5,10 @@ package akka.actor
 
 import language.implicitConversions
 import akka.util._
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import scala.collection.mutable
 import akka.routing.{ Deafen, Listen, Listeners }
-import scala.concurrent.util.FiniteDuration
+import scala.concurrent.duration.FiniteDuration
 
 object FSM {
 

akka-actor/src/main/scala/akka/actor/FaultHandling.scala

@@ -9,7 +9,7 @@ import java.util.concurrent.TimeUnit
 import scala.collection.mutable.ArrayBuffer
 import scala.collection.JavaConversions._
 import java.lang.{ Iterable ⇒ JIterable }
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 /**
  * INTERNAL API
  */

akka-actor/src/main/scala/akka/actor/IO.scala

@@ -7,7 +7,7 @@ import language.higherKinds
 import language.postfixOps
 
 import scala.concurrent.{ ExecutionContext, Future }
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import scala.util.control.NonFatal
 import akka.util.ByteString
 import java.net.{ SocketAddress, InetSocketAddress }

akka-actor/src/main/scala/akka/actor/Scheduler.scala

@@ -4,7 +4,7 @@
 
 package akka.actor
 
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import akka.util.internal.{ TimerTask, HashedWheelTimer, Timeout ⇒ HWTimeout, Timer }
 import akka.event.LoggingAdapter
 import akka.dispatch.MessageDispatcher
@@ -13,7 +13,7 @@ import java.util.concurrent.atomic.{ AtomicReference, AtomicLong }
 import scala.annotation.tailrec
 import akka.util.internal._
 import concurrent.ExecutionContext
-import scala.concurrent.util.FiniteDuration
+import scala.concurrent.duration.FiniteDuration
 
 //#scheduler
 /**

akka-actor/src/main/scala/akka/actor/TypedActor.scala

@@ -8,7 +8,7 @@ import akka.japi.{ Creator, Option ⇒ JOption }
 import java.lang.reflect.{ InvocationTargetException, Method, InvocationHandler, Proxy }
 import akka.util.Timeout
 import scala.util.control.NonFatal
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import scala.concurrent.{ Await, Future }
 import akka.util.Reflect.instantiator
 import akka.dispatch._
@@ -19,7 +19,7 @@ import scala.reflect.ClassTag
 import akka.serialization.{ JavaSerializer, SerializationExtension }
 import java.io.ObjectStreamException
 import scala.util.{ Try, Success, Failure }
-import scala.concurrent.util.FiniteDuration
+import scala.concurrent.duration.FiniteDuration
 
 /**
  * A TypedActorFactory is something that can created TypedActor instances.

akka-actor/src/main/scala/akka/actor/UntypedActor.scala

@@ -36,7 +36,7 @@ import akka.japi.{ Creator }
  *      }
  *    }
  *
- *   private static SupervisorStrategy strategy = new OneForOneStrategy(10, Duration.parse("1 minute"),
+ *   private static SupervisorStrategy strategy = new OneForOneStrategy(10, Duration.create("1 minute"),
  *     new Function<Throwable, Directive>() {
  *       @Override
  *       public Directive apply(Throwable t) {

akka-actor/src/main/scala/akka/actor/dsl/Creators.scala

@@ -6,10 +6,8 @@ package akka.actor.dsl
 
 import scala.concurrent.Await
 import akka.actor.ActorLogging
-import scala.concurrent.util.Deadline
 import scala.collection.immutable.TreeSet
-import scala.concurrent.util.{ Duration, FiniteDuration }
+import scala.concurrent.duration._
-import scala.concurrent.util.duration._
 import akka.actor.Cancellable
 import akka.actor.{ Actor, Stash, SupervisorStrategy }
 import scala.collection.mutable.Queue

akka-actor/src/main/scala/akka/actor/dsl/Inbox.scala

@@ -6,10 +6,8 @@ package akka.actor.dsl
 
 import scala.concurrent.Await
 import akka.actor.ActorLogging
-import scala.concurrent.util.Deadline
 import scala.collection.immutable.TreeSet
-import scala.concurrent.util.{ Duration, FiniteDuration }
+import scala.concurrent.duration._
-import scala.concurrent.util.duration._
 import akka.actor.Cancellable
 import akka.actor.Actor
 import scala.collection.mutable.Queue
@@ -129,10 +127,10 @@ trait Inbox { this: ActorDSL.type ⇒
         val next = clientsByTimeout.head.deadline
         import context.dispatcher
         if (currentDeadline.isEmpty) {
-          currentDeadline = Some((next, context.system.scheduler.scheduleOnce(next.timeLeft.asInstanceOf[FiniteDuration], self, Kick)))
+          currentDeadline = Some((next, context.system.scheduler.scheduleOnce(next.timeLeft, self, Kick)))
         } else if (currentDeadline.get._1 != next) {
           currentDeadline.get._2.cancel()
-          currentDeadline = Some((next, context.system.scheduler.scheduleOnce(next.timeLeft.asInstanceOf[FiniteDuration], self, Kick)))
+          currentDeadline = Some((next, context.system.scheduler.scheduleOnce(next.timeLeft, self, Kick)))
         }
       }
     }
@@ -169,7 +167,7 @@ trait Inbox { this: ActorDSL.type ⇒
      * this method within an actor!</b>
      */
     def receive(timeout: FiniteDuration = defaultTimeout): Any = {
-      implicit val t = Timeout((timeout + extraTime).asInstanceOf[FiniteDuration])
+      implicit val t = Timeout(timeout + extraTime)
       Await.result(receiver ? Get(Deadline.now + timeout), Duration.Inf)
     }
 
@@ -186,7 +184,7 @@ trait Inbox { this: ActorDSL.type ⇒
      * this method within an actor!</b>
      */
     def select[T](timeout: FiniteDuration = defaultTimeout)(predicate: PartialFunction[Any, T]): T = {
-      implicit val t = Timeout((timeout + extraTime).asInstanceOf[FiniteDuration])
+      implicit val t = Timeout(timeout + extraTime)
       predicate(Await.result(receiver ? Select(Deadline.now + timeout, predicate), Duration.Inf))
     }
 

akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala

@@ -16,7 +16,7 @@ import akka.actor.PreRestartException
 import akka.actor.Failed
 import akka.actor.PostRestartException
 import akka.event.Logging.Debug
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 
 private[akka] trait FaultHandling { this: ActorCell ⇒
 

akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala

@@ -8,8 +8,8 @@ import ReceiveTimeout.emptyReceiveTimeoutData
 import akka.actor.ActorCell
 import akka.actor.ActorCell.emptyCancellable
 import akka.actor.Cancellable
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
-import scala.concurrent.util.FiniteDuration
+import scala.concurrent.duration.FiniteDuration
 
 private[akka] object ReceiveTimeout {
   final val emptyReceiveTimeoutData: (Duration, Cancellable) = (Duration.Undefined, ActorCell.emptyCancellable)

akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala

@@ -13,10 +13,10 @@ import akka.serialization.SerializationExtension
 import akka.util.{ Unsafe, Index }
 import scala.annotation.tailrec
 import scala.concurrent.forkjoin.{ ForkJoinTask, ForkJoinPool }
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import scala.concurrent.{ ExecutionContext, Await, Awaitable }
 import scala.util.control.NonFatal
-import scala.concurrent.util.FiniteDuration
+import scala.concurrent.duration.FiniteDuration
 
 final case class Envelope private (val message: Any, val sender: ActorRef)
 

akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala

@@ -6,12 +6,12 @@ package akka.dispatch
 
 import akka.actor.{ ActorCell, ActorRef }
 import scala.annotation.tailrec
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import akka.util.Helpers
 import java.util.{ Comparator, Iterator }
 import java.util.concurrent.{ Executor, LinkedBlockingQueue, ConcurrentLinkedQueue, ConcurrentSkipListSet }
 import akka.actor.ActorSystemImpl
-import scala.concurrent.util.FiniteDuration
+import scala.concurrent.duration.FiniteDuration
 
 /**
  * An executor based event driven dispatcher which will try to redistribute work from busy actors to idle actors. It is assumed

akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala

@@ -10,9 +10,9 @@ import akka.event.Logging
 import java.util.concurrent.atomic.AtomicReference
 import java.util.concurrent.{ ExecutorService, RejectedExecutionException }
 import scala.concurrent.forkjoin.ForkJoinPool
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import scala.concurrent.Awaitable
-import scala.concurrent.util.FiniteDuration
+import scala.concurrent.duration.FiniteDuration
 
 /**
  * The event-based ``Dispatcher`` binds a set of Actors to a thread pool backed up by a

akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala

@@ -9,7 +9,7 @@ import com.typesafe.config.{ ConfigFactory, Config }
 import akka.actor.{ Scheduler, DynamicAccess, ActorSystem }
 import akka.event.Logging.Warning
 import akka.event.EventStream
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 
 /**
  * DispatcherPrerequisites represents useful contextual pieces when constructing a MessageDispatcher

akka-actor/src/main/scala/akka/dispatch/Mailbox.scala

@@ -9,11 +9,11 @@ import akka.AkkaException
 import akka.actor.{ ActorCell, ActorRef, Cell, ActorSystem, InternalActorRef, DeadLetter }
 import akka.util.{ Unsafe, BoundedBlockingQueue }
 import akka.event.Logging.Error
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import scala.annotation.tailrec
 import scala.util.control.NonFatal
 import com.typesafe.config.Config
-import scala.concurrent.util.FiniteDuration
+import scala.concurrent.duration.FiniteDuration
 
 /**
  * INTERNAL API

akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala

@@ -5,8 +5,8 @@
 package akka.dispatch
 
 import akka.actor.ActorCell
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
-import scala.concurrent.util.FiniteDuration
+import scala.concurrent.duration.FiniteDuration
 
 /**
  * Dedicates a unique thread for each actor passed in as reference. Served through its messageQueue.

akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala

@@ -6,7 +6,7 @@ package akka.dispatch
 
 import java.util.Collection
 import scala.concurrent.{ Awaitable, BlockContext, CanAwait }
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import scala.concurrent.forkjoin._
 import java.util.concurrent.{
   ArrayBlockingQueue,

akka-actor/src/main/scala/akka/event/Logging.scala

@@ -9,7 +9,7 @@ import akka.actor._
 import akka.{ ConfigurationException, AkkaException }
 import akka.actor.ActorSystem.Settings
 import akka.util.{ Timeout, ReentrantGuard }
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import java.util.concurrent.atomic.AtomicInteger
 import scala.util.control.NoStackTrace
 import java.util.concurrent.TimeoutException

akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala

@@ -10,8 +10,7 @@ import akka.util.Unsafe
 import scala.util.control.NoStackTrace
 import java.util.concurrent.{ Callable, CopyOnWriteArrayList }
 import scala.concurrent.{ ExecutionContext, Future, Promise, Await }
-import scala.concurrent.util.{ FiniteDuration, Deadline }
+import scala.concurrent.duration._
-import scala.concurrent.util.duration._
 import scala.util.control.NonFatal
 import scala.util.Success
 
@@ -35,8 +34,8 @@ object CircuitBreaker {
    *
    * @param scheduler Reference to Akka scheduler
    * @param maxFailures Maximum number of failures before opening the circuit
-   * @param callTimeout [[scala.concurrent.util.Duration]] of time after which to consider a call a failure
+   * @param callTimeout [[scala.concurrent.duration.FiniteDuration]] of time after which to consider a call a failure
-   * @param resetTimeout [[scala.concurrent.util.Duration]] of time after which to attempt to close the circuit
+   * @param resetTimeout [[scala.concurrent.duration.FiniteDuration]] of time after which to attempt to close the circuit
    */
   def apply(scheduler: Scheduler, maxFailures: Int, callTimeout: FiniteDuration, resetTimeout: FiniteDuration): CircuitBreaker =
     new CircuitBreaker(scheduler, maxFailures, callTimeout, resetTimeout)(syncExecutionContext)
@@ -49,8 +48,8 @@ object CircuitBreaker {
    *
    * @param scheduler Reference to Akka scheduler
    * @param maxFailures Maximum number of failures before opening the circuit
-   * @param callTimeout [[scala.concurrent.util.Duration]] of time after which to consider a call a failure
+   * @param callTimeout [[scala.concurrent.duration.FiniteDuration]] of time after which to consider a call a failure
-   * @param resetTimeout [[scala.concurrent.util.Duration]] of time after which to attempt to close the circuit
+   * @param resetTimeout [[scala.concurrent.duration.FiniteDuration]] of time after which to attempt to close the circuit
    */
   def create(scheduler: Scheduler, maxFailures: Int, callTimeout: FiniteDuration, resetTimeout: FiniteDuration): CircuitBreaker =
     apply(scheduler, maxFailures, callTimeout, resetTimeout)
@@ -72,8 +71,8 @@ object CircuitBreaker {
  *
  * @param scheduler Reference to Akka scheduler
  * @param maxFailures Maximum number of failures before opening the circuit
- * @param callTimeout [[scala.concurrent.util.Duration]] of time after which to consider a call a failure
+ * @param callTimeout [[scala.concurrent.duration.FiniteDuration]] of time after which to consider a call a failure
- * @param resetTimeout [[scala.concurrent.util.Duration]] of time after which to attempt to close the circuit
+ * @param resetTimeout [[scala.concurrent.duration.FiniteDuration]] of time after which to attempt to close the circuit
  * @param executor [[scala.concurrent.ExecutionContext]] used for execution of state transition listeners
  */
 class CircuitBreaker(scheduler: Scheduler, maxFailures: Int, callTimeout: FiniteDuration, resetTimeout: FiniteDuration)(implicit executor: ExecutionContext) extends AbstractCircuitBreaker {
@@ -453,12 +452,12 @@ class CircuitBreaker(scheduler: Scheduler, maxFailures: Int, callTimeout: Finite
      * @return Future containing result of protected call
      */
     override def invoke[T](body: ⇒ Future[T]): Future[T] =
-      Promise.failed[T](new CircuitBreakerOpenException(remainingTimeout().timeLeft.asInstanceOf[FiniteDuration])).future
+      Promise.failed[T](new CircuitBreakerOpenException(remainingTimeout().timeLeft)).future
 
     /**
      * Calculate remaining timeout to inform the caller in case a backoff algorithm is useful
      *
-     * @return [[akka.util.Deadline]] to when the breaker will attempt a reset by transitioning to half-open
+     * @return [[scala.concurrent.duration.Deadline]] to when the breaker will attempt a reset by transitioning to half-open
      */
     private def remainingTimeout(): Deadline = get match {
       case 0L ⇒ Deadline.now

akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala

@@ -4,11 +4,11 @@ package akka.pattern
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import scala.concurrent.{ ExecutionContext, Promise, Future }
 import akka.actor._
 import scala.util.control.NonFatal
-import scala.concurrent.util.FiniteDuration
+import scala.concurrent.duration.FiniteDuration
 
 trait FutureTimeoutSupport {
   /**

akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala

@@ -8,9 +8,9 @@ import akka.actor._
 import akka.util.{ Timeout }
 import akka.dispatch.{ Unwatch, Watch }
 import scala.concurrent.Future
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import scala.util.Success
-import scala.concurrent.util.FiniteDuration
+import scala.concurrent.duration.FiniteDuration
 
 trait GracefulStopSupport {
   /**

akka-actor/src/main/scala/akka/pattern/Patterns.scala

@@ -6,14 +6,14 @@ package akka.pattern
 import akka.actor.Scheduler
 import scala.concurrent.ExecutionContext
 import java.util.concurrent.Callable
-import scala.concurrent.util.FiniteDuration
+import scala.concurrent.duration.FiniteDuration
 
 object Patterns {
   import akka.actor.{ ActorRef, ActorSystem }
   import akka.pattern.{ ask ⇒ scalaAsk, pipe ⇒ scalaPipe, gracefulStop ⇒ scalaGracefulStop, after ⇒ scalaAfter }
   import akka.util.Timeout
   import scala.concurrent.Future
-  import scala.concurrent.util.Duration
+  import scala.concurrent.duration.Duration
 
   /**
    * <i>Java API for `akka.pattern.ask`:</i>

akka-actor/src/main/scala/akka/routing/Routing.scala

@@ -6,8 +6,7 @@ package akka.routing
 import language.implicitConversions
 import language.postfixOps
 import akka.actor._
-import scala.concurrent.util.Duration
+import scala.concurrent.duration._
-import scala.concurrent.util.duration._
 import akka.ConfigurationException
 import akka.pattern.pipe
 import com.typesafe.config.Config
@@ -18,7 +17,6 @@ import scala.concurrent.forkjoin.ThreadLocalRandom
 import akka.dispatch.Dispatchers
 import scala.annotation.tailrec
 import concurrent.ExecutionContext
-import scala.concurrent.util.FiniteDuration
 
 /**
  * A RoutedActorRef is an ActorRef that has a set of connected ActorRef and it uses a Router to

akka-actor/src/main/scala/akka/util/Timeout.scala

@@ -8,7 +8,7 @@ import language.implicitConversions
 
 import java.util.concurrent.TimeUnit
 import java.lang.{ Double ⇒ JDouble }
-import scala.concurrent.util.{ Duration, FiniteDuration }
+import scala.concurrent.duration.{ Duration, FiniteDuration }
 
 @SerialVersionUID(1L)
 case class Timeout(duration: FiniteDuration) {

akka-agent/src/main/scala/akka/agent/Agent.scala

@@ -10,7 +10,7 @@ import akka.pattern.ask
 import akka.util.Timeout
 import scala.concurrent.stm._
 import scala.concurrent.{ ExecutionContext, Future, Promise, Await }
-import scala.concurrent.util.{ FiniteDuration, Duration }
+import scala.concurrent.duration.{ FiniteDuration, Duration }
 
 /**
  * Used internally to send functions.

akka-agent/src/test/scala/akka/agent/AgentSpec.scala

@@ -3,8 +3,7 @@ package akka.agent
 import language.postfixOps
 
 import scala.concurrent.{ Await, Future }
-import scala.concurrent.util.Duration
+import scala.concurrent.duration._
-import scala.concurrent.util.duration._
 import akka.util.Timeout
 import akka.testkit._
 import scala.concurrent.stm._

akka-camel/src/main/scala/akka/camel/Activation.scala

@@ -8,8 +8,9 @@ import akka.camel.internal._
 import akka.util.Timeout
 import akka.actor.{ ActorSystem, Props, ActorRef }
 import akka.pattern._
-import scala.concurrent.util.Duration
 import concurrent.{ ExecutionContext, Future }
+import scala.concurrent.duration.Duration
+import scala.concurrent.duration.FiniteDuration
 
 /**
  * Activation trait that can be used to wait on activation or de-activation of Camel endpoints.
@@ -34,4 +35,4 @@ trait Activation {
    * @param timeout the timeout of the Future
    */
   def deactivationFutureFor(endpoint: ActorRef)(implicit timeout: Timeout, executor: ExecutionContext): Future[ActorRef]
-}
+}

akka-camel/src/main/scala/akka/camel/ActorRouteDefinition.scala

@@ -7,7 +7,7 @@ package akka.camel
 import akka.actor.ActorRef
 import akka.camel.internal.component.CamelPath
 import org.apache.camel.model.ProcessorDefinition
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 
 /**
  * Wraps a [[org.apache.camel.model.ProcessorDefinition]].

akka-camel/src/main/scala/akka/camel/Camel.scala

@@ -10,10 +10,10 @@ import org.apache.camel.ProducerTemplate
 import org.apache.camel.impl.DefaultCamelContext
 import org.apache.camel.model.RouteDefinition
 import com.typesafe.config.Config
-import scala.concurrent.util.Duration
-import scala.concurrent.util.FiniteDuration
-import java.util.concurrent.TimeUnit._
 import akka.ConfigurationException
+import scala.concurrent.duration.Duration
+import java.util.concurrent.TimeUnit._
+import scala.concurrent.duration.FiniteDuration
 
 /**
  * Camel trait encapsulates the underlying camel machinery.

akka-camel/src/main/scala/akka/camel/CamelSupport.scala

@@ -2,7 +2,7 @@ package akka.camel
 
 import akka.actor.Actor
 import com.typesafe.config.Config
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import java.util.concurrent.TimeUnit._
 
 private[camel] trait CamelSupport { this: Actor ⇒

akka-camel/src/main/scala/akka/camel/Consumer.scala

@@ -7,7 +7,7 @@ package akka.camel
 import akka.camel.internal.CamelSupervisor.Register
 import org.apache.camel.model.{ RouteDefinition, ProcessorDefinition }
 import akka.actor._
-import scala.concurrent.util.FiniteDuration
+import scala.concurrent.duration._
 import akka.dispatch.Mapper
 
 /**

akka-camel/src/main/scala/akka/camel/internal/DefaultCamel.scala

@@ -7,8 +7,7 @@ import akka.event.Logging
 import akka.camel.{ CamelSettings, Camel }
 import akka.camel.internal.ActivationProtocol._
 import scala.util.control.NonFatal
-import scala.concurrent.util.Duration
+import scala.concurrent.duration._
-import scala.concurrent.util.FiniteDuration
 import org.apache.camel.ProducerTemplate
 import concurrent.{ Future, ExecutionContext }
 import akka.util.Timeout
@@ -99,4 +98,4 @@ private[camel] class DefaultCamel(val system: ExtendedActorSystem) extends Camel
       case EndpointDeActivated(`endpoint`)               ⇒ endpoint
       case EndpointFailedToDeActivate(`endpoint`, cause) ⇒ throw cause
     })
-}
+}

akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala

@@ -11,8 +11,7 @@ import org.apache.camel.impl.{ DefaultProducer, DefaultEndpoint, DefaultComponen
 import akka.actor._
 import akka.pattern._
 import scala.reflect.BeanProperty
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
-import scala.concurrent.util.Duration
 import scala.concurrent.{ ExecutionContext, Future }
 import scala.util.control.NonFatal
 import java.util.concurrent.{ TimeUnit, TimeoutException, CountDownLatch }
@@ -21,7 +20,6 @@ import akka.camel.internal.CamelExchangeAdapter
 import akka.camel.{ ActorNotRegisteredException, Camel, Ack, FailureResult, CamelMessage }
 import support.TypeConverterSupport
 import scala.util.{ Failure, Success, Try }
-import scala.concurrent.util.FiniteDuration
 
 /**
  * For internal use only.
@@ -183,7 +181,7 @@ private[camel] class ActorProducer(val endpoint: ActorEndpoint, camel: Camel) ex
 }
 
 /**
- * For internal use only. Converts Strings to [[scala.concurrent.util.Duration]]
+ * For internal use only. Converts Strings to [[scala.concurrent.duration.Duration]]
  */
 private[camel] object DurationTypeConverter extends TypeConverterSupport {
 

akka-camel/src/test/java/akka/camel/ConsumerJavaTestBase.java

@@ -4,6 +4,8 @@
 
 package akka.camel;
 
+import scala.concurrent.duration.Duration;
+import scala.concurrent.duration.FiniteDuration;
 import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
 import akka.actor.Props;
@@ -11,12 +13,10 @@ import akka.testkit.JavaTestKit;
 import akka.util.Timeout;
 import scala.concurrent.Await;
 import scala.concurrent.ExecutionContext;
-import scala.concurrent.util.Duration;
 import org.junit.AfterClass;
 import org.junit.Test;
 import java.util.concurrent.TimeUnit;
 import akka.testkit.AkkaSpec;
-import scala.concurrent.util.FiniteDuration;
 import static org.junit.Assert.*;
 /**
  * @author Martin Krasser

akka-camel/src/test/java/akka/camel/CustomRouteTestBase.java

@@ -7,7 +7,8 @@ import akka.camel.javaapi.UntypedProducerActor;
 import akka.util.Timeout;
 import scala.concurrent.Await;
 import scala.concurrent.ExecutionContext;
-import scala.concurrent.util.Duration;
+import scala.concurrent.duration.Duration;
+import scala.concurrent.duration.FiniteDuration;
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.Exchange;
 import org.apache.camel.Predicate;
@@ -16,7 +17,6 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Before;
 import org.junit.After;
 import org.junit.Test;
-import scala.concurrent.util.FiniteDuration;
 
 import java.util.concurrent.TimeUnit;
 

akka-camel/src/test/java/akka/camel/SampleErrorHandlingConsumer.java

@@ -7,12 +7,12 @@ package akka.camel;
 import akka.actor.Status;
 import akka.camel.javaapi.UntypedConsumerActor;
 import akka.dispatch.Mapper;
-import scala.concurrent.util.Duration;
+import scala.concurrent.duration.Duration;
 import org.apache.camel.builder.Builder;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.RouteDefinition;
 import scala.Option;
-import scala.concurrent.util.FiniteDuration;
+import scala.concurrent.duration.FiniteDuration;
 
 /**
  * @author Martin Krasser

akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala

@@ -7,7 +7,7 @@ package akka.camel
 import language.postfixOps
 
 import org.scalatest.matchers.MustMatchers
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import org.apache.camel.ProducerTemplate
 import akka.actor._
 import TestSupport._

akka-camel/src/test/scala/akka/camel/CamelConfigSpec.scala

@@ -6,7 +6,7 @@ package akka.camel
 import org.scalatest.matchers.MustMatchers
 import org.scalatest.WordSpec
 import akka.actor.ActorSystem
-import scala.concurrent.util.Duration
+import scala.concurrent.duration.Duration
 import java.util.concurrent.TimeUnit._
 
 class CamelConfigSpec extends WordSpec with MustMatchers {

akka-camel/src/test/scala/akka/camel/ConcurrentActivationTest.scala

@@ -6,7 +6,7 @@ import akka.camel.TestSupport.NonSharedCamelSystem
 import akka.actor.{ ActorRef, Props, Actor }
 import akka.routing.BroadcastRouter
 import concurrent.{ Promise, Await, Future }
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import language.postfixOps
 import akka.testkit._
 import akka.util.Timeout

akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala

@@ -17,7 +17,7 @@ import org.apache.camel.builder.Builder
 import org.apache.camel.{ FailedToCreateRouteException, CamelExecutionException }
 import java.util.concurrent.{ ExecutionException, TimeUnit, TimeoutException }
 import akka.actor.Status.Failure
-import scala.concurrent.util.duration._
+import scala.concurrent.duration._
 import concurrent.{ ExecutionContext, Await }
 import akka.testkit._
 import akka.util.Timeout