From 78022732b9bfd5b380abc02aa26dad4f0217fa4d Mon Sep 17 00:00:00 2001 From: Heiko Seeberger Date: Tue, 21 Feb 2017 12:24:26 +0100 Subject: [PATCH] Fix configuration for persistence-query test deps (fix #22342) --- .../persistence/PersistentActorJournalProtocolSpec.scala | 2 +- .../src/main/scala/akka/stream/stage/GraphStage.scala | 6 +++--- project/AkkaBuild.scala | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistentActorJournalProtocolSpec.scala b/akka-persistence/src/test/scala/akka/persistence/PersistentActorJournalProtocolSpec.scala index 6d5a7181d2..ad6d5a0b7d 100644 --- a/akka-persistence/src/test/scala/akka/persistence/PersistentActorJournalProtocolSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/PersistentActorJournalProtocolSpec.scala @@ -75,7 +75,7 @@ akka.persistence.snapshot-store.plugin = "akka.persistence.no-snapshot-store" } object JournalPuppet extends ExtensionId[JournalProbe] with ExtensionIdProvider { - override def lookup()= JournalPuppet + override def lookup() = JournalPuppet override def createExtension(system: ExtendedActorSystem): JournalProbe = new JournalProbe()(system) diff --git a/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala b/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala index 7d68f1d54d..4ae5352a51 100644 --- a/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala +++ b/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala @@ -10,14 +10,14 @@ import java.util.concurrent.locks.ReentrantLock import akka.actor._ import akka.annotation.ApiMayChange -import akka.japi.function.{Effect, Procedure} +import akka.japi.function.{ Effect, Procedure } import akka.stream._ import akka.stream.impl.StreamLayout.Module -import akka.stream.impl.fusing.{GraphInterpreter, GraphStageModule, SubSink, SubSource} +import akka.stream.impl.fusing.{ GraphInterpreter, GraphStageModule, SubSink, SubSource } import akka.stream.impl.ReactiveStreamsCompliance import scala.collection.mutable.ArrayBuffer -import scala.collection.{immutable, mutable} +import scala.collection.{ immutable, mutable } import scala.concurrent.duration.FiniteDuration import akka.stream.actor.ActorSubscriberMessage diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index ab27f3ad39..e04c38ffb9 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -200,8 +200,7 @@ object AkkaBuild extends Build { dependencies = Seq( stream, persistence % "compile;provided->provided;test->test", - testkit % "compile;test->test", - streamTestkit % "compile;test->test") + streamTestkit % "test") ) lazy val persistenceTck = Project(