raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge pull request #22349 from hseeberger/22342-dependency-configurations

Browse source 
Fix configuration for persistence-query test deps (fix #22342)
This commit is contained in:
Patrik Nordwall 2017-02-21 13:23:53 +01:00 • committed by GitHub
commit 37f4436a39
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-persistence/src/test/scala/akka/persistence/PersistentActorJournalProtocolSpec.scala
View file

@ -75,7 +75,7 @@ akka.persistence.snapshot-store.plugin = "akka.persistence.no-snapshot-store"
} }
object JournalPuppet extends ExtensionId[JournalProbe] with ExtensionIdProvider { object JournalPuppet extends ExtensionId[JournalProbe] with ExtensionIdProvider {
override def lookup()= JournalPuppet override def lookup() = JournalPuppet
override def createExtension(system: ExtendedActorSystem): JournalProbe = override def createExtension(system: ExtendedActorSystem): JournalProbe =
new JournalProbe()(system) new JournalProbe()(system)

6
akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala
View file

@ -10,14 +10,14 @@ import java.util.concurrent.locks.ReentrantLock
import akka.actor._ import akka.actor._
import akka.annotation.ApiMayChange import akka.annotation.ApiMayChange
import akka.japi.function.{Effect, Procedure} import akka.japi.function.{ Effect, Procedure }
import akka.stream._ import akka.stream._
import akka.stream.impl.StreamLayout.Module 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 akka.stream.impl.ReactiveStreamsCompliance
import scala.collection.mutable.ArrayBuffer import scala.collection.mutable.ArrayBuffer
import scala.collection.{immutable, mutable} import scala.collection.{ immutable, mutable }
import scala.concurrent.duration.FiniteDuration import scala.concurrent.duration.FiniteDuration
import akka.stream.actor.ActorSubscriberMessage import akka.stream.actor.ActorSubscriberMessage

3
project/AkkaBuild.scala
View file

@ -200,8 +200,7 @@ object AkkaBuild extends Build {
dependencies = Seq( dependencies = Seq(
stream, stream,
persistence % "compile;provided->provided;test->test", persistence % "compile;provided->provided;test->test",
testkit % "compile;test->test", streamTestkit % "test")
streamTestkit % "compile;test->test")
) )
lazy val persistenceTck = Project( lazy val persistenceTck = Project(