[TOREE-514] Update Toree kernel dependencies
Update the following dependencies:
- Akka 2.5.27
- 0MQ 0.4.3
- Spring Framework 5.2.2.RELEASE
diff --git a/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClientSpec.scala b/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClientSpec.scala
index f6da396..e517bc3 100644
--- a/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClientSpec.scala
+++ b/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClientSpec.scala
@@ -105,7 +105,7 @@
stdinClient ! notInputRequestMessage
- socketProbe.expectNoMsg(300.milliseconds)
+ socketProbe.expectNoMessage(300.milliseconds)
}
it("should respond with an input_reply if the incoming message is " +
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommCloseHandlerSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommCloseHandlerSpec.scala
index 1429d81..81d5884 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommCloseHandlerSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommCloseHandlerSpec.scala
@@ -123,7 +123,7 @@
// TODO: Is there a better way to test for this without an upper time
// limit? Is there a different logical approach?
- kernelMessageRelayProbe.expectNoMsg(MaxAkkaTestTimeout)
+ kernelMessageRelayProbe.expectNoMessage(MaxAkkaTestTimeout)
}
it("should include the parent's header in the parent header of " +
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommMsgHandlerSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommMsgHandlerSpec.scala
index 89841f6..085310f 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommMsgHandlerSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommMsgHandlerSpec.scala
@@ -118,7 +118,7 @@
// TODO: Is there a better way to test for this without an upper time
// limit? Is there a different logical approach?
- kernelMessageRelayProbe.expectNoMsg(MaxAkkaTestTimeout)
+ kernelMessageRelayProbe.expectNoMessage(MaxAkkaTestTimeout)
}
it("should include the parent's header in the parent header of " +
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommOpenHandlerSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommOpenHandlerSpec.scala
index 23c9069..5180eb8 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommOpenHandlerSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommOpenHandlerSpec.scala
@@ -122,7 +122,7 @@
// TODO: Is there a better way to test for this without an upper time
// limit? Is there a different logical approach?
- kernelMessageRelayProbe.expectNoMsg(MaxAkkaTestTimeout)
+ kernelMessageRelayProbe.expectNoMessage(MaxAkkaTestTimeout)
}
it("should include the parent's header in the parent header of " +
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/InputRequestReplyHandlerSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/InputRequestReplyHandlerSpec.scala
index a78455e..5414b67 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/InputRequestReplyHandlerSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/InputRequestReplyHandlerSpec.scala
@@ -131,7 +131,7 @@
fakeSender.send(inputRequestReplyHandler, inputReplyMessage)
// Sender should not receive a response
- fakeSender.expectNoMsg(MaxAkkaTestTimeout)
+ fakeSender.expectNoMessage(MaxAkkaTestTimeout)
}
}
}
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/ActorLoaderSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/ActorLoaderSpec.scala
index e6e2184..8091ab7 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/ActorLoaderSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/ActorLoaderSpec.scala
@@ -47,11 +47,11 @@
val testProbe: TestProbe = TestProbe()
val actorLoader: ActorLoader = SimpleActorLoader(system)
actorLoader.load(MessageType.Outgoing.CompleteReply) ! "<Test Message>"
- testProbe.expectNoMsg(MaxAkkaTestTimeout)
+ testProbe.expectNoMessage(MaxAkkaTestTimeout)
// This is to test to see if there the messages go to the actor inbox or the dead mail inbox
system.actorOf(Props(classOf[TestProbeProxyActor], testProbe),
MessageType.Outgoing.CompleteReply.toString)
- testProbe.expectNoMsg(MaxAkkaTestTimeout)
+ testProbe.expectNoMessage(MaxAkkaTestTimeout)
}
}
describe("#load( SocketType )"){
@@ -67,10 +67,10 @@
val testProbe: TestProbe = TestProbe()
val actorLoader: ActorLoader = SimpleActorLoader(system)
actorLoader.load(SocketType.IOPub) ! "<Test Message>"
- testProbe.expectNoMsg(MaxAkkaTestTimeout)
+ testProbe.expectNoMessage(MaxAkkaTestTimeout)
// This is to test to see if there the messages go to the actor inbox or the dead mail inbox
system.actorOf(Props(classOf[TestProbeProxyActor], testProbe), SocketType.IOPub.toString)
- testProbe.expectNoMsg(MaxAkkaTestTimeout)
+ testProbe.expectNoMessage(MaxAkkaTestTimeout)
}
}
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/relay/KernelMessageRelaySpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/relay/KernelMessageRelaySpec.scala
index 2935f4b..bdce4ab 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/relay/KernelMessageRelaySpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/relay/KernelMessageRelaySpec.scala
@@ -104,12 +104,12 @@
it("should not send anything to SignatureManager for incoming") {
relayWithoutSignatureManager ! true // Mark as ready for incoming
relayWithoutSignatureManager ! incomingKernelMessage
- signatureProbe.expectNoMsg(MaxAkkaTestTimeout)
+ signatureProbe.expectNoMessage(MaxAkkaTestTimeout)
}
it("should not send anything to SignatureManager for outgoing") {
relayWithoutSignatureManager ! outgoingKernelMessage
- signatureProbe.expectNoMsg(MaxAkkaTestTimeout)
+ signatureProbe.expectNoMessage(MaxAkkaTestTimeout)
}
it("should relay KernelMessage for incoming") {
@@ -143,7 +143,7 @@
val incomingMessage: ZMQMessage = incomingKernelMessage
relayWithoutSignatureManager ! incomingMessage
- captureProbe.expectNoMsg(MaxAkkaTestTimeout)
+ captureProbe.expectNoMessage(MaxAkkaTestTimeout)
}
it("should relay the message if it is outgoing") {
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelInputStreamSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelInputStreamSpec.scala
index 739828a..072dc2d 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelInputStreamSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelInputStreamSpec.scala
@@ -139,7 +139,7 @@
kernelInputStream.read() should be (TestReplyString.charAt(i - 1))
kernelInputOutputHandlerProbe.expectMsgClass(MaxAkkaTestTimeout, classOf[KernelMessage])
- kernelInputOutputHandlerProbe.expectNoMsg(MaxAkkaTestTimeout)
+ kernelInputOutputHandlerProbe.expectNoMessage(MaxAkkaTestTimeout)
}
}
}
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelOuputStreamSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelOuputStreamSpec.scala
index c9ee2aa..c801c0e 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelOuputStreamSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelOuputStreamSpec.scala
@@ -200,7 +200,7 @@
kernelOutputStream.flush()
Then("no message should be sent")
- kernelOutputRelayProbe.expectNoMsg(MaxAkkaTestTimeout)
+ kernelOutputRelayProbe.expectNoMessage(MaxAkkaTestTimeout)
}
it("should send empty (whitespace) messages if flag is true") {
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 01c78f1..a8c932d 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -22,9 +22,9 @@
// Libraries
- val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.20" // Apache v2
- val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % "2.4.20" // Apache v2
- val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % "2.4.20" // Apache v2
+ val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.5.27" // Apache v2
+ val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % "2.5.27" // Apache v2
+ val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % "2.5.27" // Apache v2
val clapper = "org.clapper" %% "classutil" % "1.0.12" // BSD 3-clause license, used for detecting plugins
@@ -41,7 +41,7 @@
// use the same jackson version in test than the one provided at runtime by Spark 2.0.0
val jacksonDatabind = "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.5" // Apache v2
- val jeroMq = "org.zeromq" % "jeromq" % "0.3.6" // MPL v2
+ val jeroMq = "org.zeromq" % "jeromq" % "0.4.3" // MPL v2
val joptSimple = "net.sf.jopt-simple" % "jopt-simple" % "4.9" // MIT
@@ -65,7 +65,7 @@
val sparkSql = Def.setting{ "org.apache.spark" %% "spark-sql" % sparkVersion.value } // Apache v2
val sparkStreaming = Def.setting{ "org.apache.spark" %% "spark-streaming" % sparkVersion.value } // Apache v2
- val springCore = "org.springframework" % "spring-core" % "4.1.1.RELEASE"// Apache v2
+ val springCore = "org.springframework" % "spring-core" % "5.2.2.RELEASE"// Apache v2
val guava = "com.google.guava" % "guava" % "14.0.1" // Apache v2
