dubee closed pull request #269: Fix spray-json import to comply with newer versions. URL: https://github.com/apache/incubator-openwhisk-catalog/pull/269
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/tests/src/test/scala/packages/slack/SlackTests.scala b/tests/src/test/scala/packages/slack/SlackTests.scala index dbcdc40..1c2e7df 100644 --- a/tests/src/test/scala/packages/slack/SlackTests.scala +++ b/tests/src/test/scala/packages/slack/SlackTests.scala @@ -21,8 +21,8 @@ import org.junit.runner.RunWith import org.scalatest.BeforeAndAfterAll import org.scalatest.junit.JUnitRunner import common._ -import spray.json.DefaultJsonProtocol.StringJsonFormat -import spray.json.pimpAny +import spray.json.DefaultJsonProtocol._ +import spray.json._ @RunWith(classOf[JUnitRunner]) class SlackTests extends TestHelpers diff --git a/tests/src/test/scala/packages/watson/WatsonTests.scala b/tests/src/test/scala/packages/watson/WatsonTests.scala index 17e5a0c..83548bc 100644 --- a/tests/src/test/scala/packages/watson/WatsonTests.scala +++ b/tests/src/test/scala/packages/watson/WatsonTests.scala @@ -26,8 +26,8 @@ import common.Wsk import common.WskProps import common.WskTestHelpers import common.TestUtils -import spray.json.DefaultJsonProtocol.StringJsonFormat -import spray.json.pimpAny +import spray.json.DefaultJsonProtocol._ +import spray.json._ @RunWith(classOf[JUnitRunner]) class WatsonTests diff --git a/tests/src/test/scala/packages/weather/WeatherTests.scala b/tests/src/test/scala/packages/weather/WeatherTests.scala index ce9fe84..c2f7162 100644 --- a/tests/src/test/scala/packages/weather/WeatherTests.scala +++ b/tests/src/test/scala/packages/weather/WeatherTests.scala @@ -20,8 +20,8 @@ package packages.weather import common._ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner -import spray.json.DefaultJsonProtocol.StringJsonFormat -import spray.json.pimpAny +import spray.json.DefaultJsonProtocol._ +import spray.json._ @RunWith(classOf[JUnitRunner]) class WeatherTests ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
