[openwhisk] branch master updated: Upgrade scalatest to 3.0.8. (#4770)

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 077856f  Upgrade scalatest to 3.0.8. (#4770)
077856f is described below

commit 077856f47c7060c5939c21b76714bf0138eef8af
Author: Markus Thömmes <ma...@me.com>
AuthorDate: Tue Dec 17 04:11:49 2019 +0100

    Upgrade scalatest to 3.0.8. (#4770)
---
 core/monitoring/user-events/build.gradle                                | 2 +-
 core/standalone/build.gradle                                            | 2 +-
 tests/build.gradle                                                      | 2 +-
 .../scala/org/apache/openwhisk/core/entity/test/DatastoreTests.scala    | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/monitoring/user-events/build.gradle b/core/monitoring/user-events/build.gradle
index 7391bb7..a657586 100644
--- a/core/monitoring/user-events/build.gradle
+++ b/core/monitoring/user-events/build.gradle
@@ -39,7 +39,7 @@ dependencies {
     compile "io.prometheus:simpleclient_common:0.6.0"
 
     testCompile "junit:junit:4.11"
-    testCompile "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.1"
+    testCompile "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8"
     testCompile "com.typesafe.akka:akka-stream-kafka-testkit_${gradle.scala.depVersion}:${gradle.akka_kafka.version}"
     testCompile "com.typesafe.akka:akka-testkit_${gradle.scala.depVersion}:${gradle.akka.version}"
     testCompile "com.typesafe.akka:akka-stream-testkit_${gradle.scala.depVersion}:${gradle.akka.version}"
diff --git a/core/standalone/build.gradle b/core/standalone/build.gradle
index 320b5f6..1dd7dbe 100644
--- a/core/standalone/build.gradle
+++ b/core/standalone/build.gradle
@@ -157,7 +157,7 @@ dependencies {
     compile "org.scala-lang:scala-reflect:${gradle.scala.version}"
 
     testCompile "junit:junit:4.11"
-    testCompile "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.5"
+    testCompile "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8"
 }
 
 tasks.withType(ScalaCompile) {
diff --git a/tests/build.gradle b/tests/build.gradle
index bfe14d8..91976ee 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -189,7 +189,7 @@ dependencies {
     compile "org.apache.httpcomponents:httpmime:4.3.6"
     compile "junit:junit:4.11"
     compile "io.rest-assured:rest-assured:4.0.0"
-    compile "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.5"
+    compile "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8"
     compile "com.typesafe.akka:akka-testkit_${gradle.scala.depVersion}:${gradle.akka.version}"
     compile "com.google.code.gson:gson:2.3.1"
     compile "org.scalamock:scalamock_${gradle.scala.depVersion}:4.4.0"
diff --git a/tests/src/test/scala/org/apache/openwhisk/core/entity/test/DatastoreTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/entity/test/DatastoreTests.scala
index c445c59..eca4b2c 100644
--- a/tests/src/test/scala/org/apache/openwhisk/core/entity/test/DatastoreTests.scala
+++ b/tests/src/test/scala/org/apache/openwhisk/core/entity/test/DatastoreTests.scala
@@ -26,7 +26,6 @@ import org.scalatest.junit.JUnitRunner
 import akka.stream.ActorMaterializer
 import common.{StreamLogging, WskActorSystem}
 import org.apache.openwhisk.common.WhiskInstants
-import org.scalatest.mockito.MockitoSugar
 import org.mockito.Mockito._
 import org.apache.openwhisk.core.database.DocumentConflictException
 import org.apache.openwhisk.core.database.CacheChangeNotification
@@ -42,7 +41,6 @@ class DatastoreTests
     with WskActorSystem
     with DbUtils
     with ExecHelpers
-    with MockitoSugar
     with StreamLogging
     with WhiskInstants {