You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/02/28 16:31:53 UTC
[GitHub] markusthoemmes closed pull request #3085: Update akka-http to 10.0.11
markusthoemmes closed pull request #3085: Update akka-http to 10.0.11
URL: https://github.com/apache/incubator-openwhisk/pull/3085
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/common/scala/build.gradle b/common/scala/build.gradle
index 31781f4b46..51e54ef1e9 100644
--- a/common/scala/build.gradle
+++ b/common/scala/build.gradle
@@ -18,8 +18,8 @@ dependencies {
compile 'com.typesafe.akka:akka-stream_2.11:2.5.6'
compile 'com.typesafe.akka:akka-slf4j_2.11:2.5.6'
- compile 'com.typesafe.akka:akka-http-core_2.11:10.0.10'
- compile 'com.typesafe.akka:akka-http-spray-json_2.11:10.0.10'
+ compile "com.typesafe.akka:akka-http-core_2.11:${gradle.akkahttp.version}"
+ compile "com.typesafe.akka:akka-http-spray-json_2.11:${gradle.akkahttp.version}"
compile 'ch.qos.logback:logback-classic:1.2.3'
compile 'org.slf4j:jcl-over-slf4j:1.7.25'
diff --git a/common/scala/src/main/scala/whisk/core/entity/ArgNormalizer.scala b/common/scala/src/main/scala/whisk/core/entity/ArgNormalizer.scala
index 66676397f3..c035aa455b 100644
--- a/common/scala/src/main/scala/whisk/core/entity/ArgNormalizer.scala
+++ b/common/scala/src/main/scala/whisk/core/entity/ArgNormalizer.scala
@@ -18,8 +18,8 @@
package whisk.core.entity
import spray.json.RootJsonFormat
-import spray.json.pimpString
import spray.json.JsString
+import spray.json._
import scala.util.Try
protected[entity] trait ArgNormalizer[T] {
diff --git a/settings.gradle b/settings.gradle
index 57c899386a..08dada4260 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -28,3 +28,7 @@ gradle.ext.scalafmt = [
version: '1.5.0',
config: new File(rootProject.projectDir, '.scalafmt.conf')
]
+
+gradle.ext.akkahttp = [
+ version: '10.0.11'
+]
diff --git a/tests/build.gradle b/tests/build.gradle
index 2aa602ac1f..22dca2553a 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -62,7 +62,7 @@ dependencies {
compile 'com.google.code.gson:gson:2.3.1'
compile 'org.scalamock:scalamock-scalatest-support_2.11:3.4.2'
compile 'com.typesafe.akka:akka-testkit_2.11:2.4.16'
- compile 'com.typesafe.akka:akka-http-testkit_2.11:10.0.10'
+ compile "com.typesafe.akka:akka-http-testkit_2.11:${gradle.akkahttp.version}"
compile 'com.github.java-json-tools:json-schema-validator:2.2.8';
compile project(':common:scala')
diff --git a/tests/src/test/scala/common/BaseWsk.scala b/tests/src/test/scala/common/BaseWsk.scala
index 0917fa6942..4c1b11a99c 100644
--- a/tests/src/test/scala/common/BaseWsk.scala
+++ b/tests/src/test/scala/common/BaseWsk.scala
@@ -31,7 +31,7 @@ import org.scalatest.Matchers
import TestUtils._
import spray.json.JsObject
import spray.json.JsValue
-import spray.json.pimpString
+import spray.json._
import whisk.core.entity.ByteSize
case class WskProps(
diff --git a/tests/src/test/scala/common/rest/WskRest.scala b/tests/src/test/scala/common/rest/WskRest.scala
index a8f93ba6a5..5c1410dcd1 100644
--- a/tests/src/test/scala/common/rest/WskRest.scala
+++ b/tests/src/test/scala/common/rest/WskRest.scala
@@ -72,7 +72,6 @@ import spray.json._
import spray.json.DefaultJsonProtocol._
import spray.json.JsObject
import spray.json.JsValue
-import spray.json.pimpString
import common._
import common.BaseDeleteFromCollection
diff --git a/tests/src/test/scala/system/basic/WskActionTests.scala b/tests/src/test/scala/system/basic/WskActionTests.scala
index 7836b03d16..49c1e2536f 100644
--- a/tests/src/test/scala/system/basic/WskActionTests.scala
+++ b/tests/src/test/scala/system/basic/WskActionTests.scala
@@ -31,7 +31,6 @@ import common.WskTestHelpers
import spray.json._
import spray.json.DefaultJsonProtocol._
import spray.json.JsObject
-import spray.json.pimpAny
@RunWith(classOf[JUnitRunner])
abstract class WskActionTests extends TestHelpers with WskTestHelpers with JsHelpers {
diff --git a/tests/src/test/scala/system/basic/WskBasicSwift3Tests.scala b/tests/src/test/scala/system/basic/WskBasicSwift3Tests.scala
index bd95619ea5..5a4fa2ba20 100644
--- a/tests/src/test/scala/system/basic/WskBasicSwift3Tests.scala
+++ b/tests/src/test/scala/system/basic/WskBasicSwift3Tests.scala
@@ -26,7 +26,7 @@ import common.TestUtils
import common.BaseWsk
import common.WskProps
import common.WskTestHelpers
-import spray.json.pimpString
+import spray.json._
import spray.json.JsString
import common.TestUtils.RunResult
import spray.json.JsObject
diff --git a/tests/src/test/scala/system/basic/WskBasicTests.scala b/tests/src/test/scala/system/basic/WskBasicTests.scala
index d5faee9d5b..62b491909a 100644
--- a/tests/src/test/scala/system/basic/WskBasicTests.scala
+++ b/tests/src/test/scala/system/basic/WskBasicTests.scala
@@ -34,7 +34,6 @@ import common.WskProps
import common.WskTestHelpers
import spray.json._
import spray.json.DefaultJsonProtocol._
-import spray.json.pimpAny
import whisk.http.Messages
diff --git a/tests/src/test/scala/system/basic/WskConsoleTests.scala b/tests/src/test/scala/system/basic/WskConsoleTests.scala
index 9df9bcb4c0..8343eb05e6 100644
--- a/tests/src/test/scala/system/basic/WskConsoleTests.scala
+++ b/tests/src/test/scala/system/basic/WskConsoleTests.scala
@@ -34,7 +34,7 @@ import common.WskProps
import common.WskTestHelpers
import spray.json.DefaultJsonProtocol.IntJsonFormat
import spray.json.DefaultJsonProtocol.StringJsonFormat
-import spray.json.pimpAny
+import spray.json._
/**
* Tests of the text console
diff --git a/tests/src/test/scala/system/rest/ActionSchemaTests.scala b/tests/src/test/scala/system/rest/ActionSchemaTests.scala
index b88b231887..9385587a9f 100644
--- a/tests/src/test/scala/system/rest/ActionSchemaTests.scala
+++ b/tests/src/test/scala/system/rest/ActionSchemaTests.scala
@@ -34,7 +34,7 @@ import common.WskProps
import common.WskTestHelpers
import spray.json.JsArray
import spray.json.JsObject
-import spray.json.pimpString
+import spray.json._
/**
* Basic tests of API calls for actions
diff --git a/tests/src/test/scala/system/rest/RestUtil.scala b/tests/src/test/scala/system/rest/RestUtil.scala
index b5dddb1f6a..1882ecadc1 100644
--- a/tests/src/test/scala/system/rest/RestUtil.scala
+++ b/tests/src/test/scala/system/rest/RestUtil.scala
@@ -26,7 +26,7 @@ import com.jayway.restassured.config.SSLConfig
import common.WhiskProperties
import spray.json.JsObject
import spray.json.JsValue
-import spray.json.pimpString
+import spray.json._
/**
* Utilities for REST tests
diff --git a/tests/src/test/scala/whisk/core/cli/test/Swift311Tests.scala b/tests/src/test/scala/whisk/core/cli/test/Swift311Tests.scala
index a00b1ea6e4..7d4d059532 100644
--- a/tests/src/test/scala/whisk/core/cli/test/Swift311Tests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/Swift311Tests.scala
@@ -28,7 +28,7 @@ import common.rest.WskRest
import common.WskProps
import common.WskTestHelpers
import spray.json.DefaultJsonProtocol.StringJsonFormat
-import spray.json.pimpAny
+import spray.json._
@RunWith(classOf[JUnitRunner])
class Swift311Tests extends TestHelpers with WskTestHelpers with Matchers {
diff --git a/tests/src/test/scala/whisk/core/database/test/CleanUpActivationsTest.scala b/tests/src/test/scala/whisk/core/database/test/CleanUpActivationsTest.scala
index 997397fe87..7c2370e68a 100644
--- a/tests/src/test/scala/whisk/core/database/test/CleanUpActivationsTest.scala
+++ b/tests/src/test/scala/whisk/core/database/test/CleanUpActivationsTest.scala
@@ -38,7 +38,7 @@ import common.WhiskProperties
import common.WskActorSystem
import spray.json.DefaultJsonProtocol._
import spray.json.JsObject
-import spray.json.pimpAny
+import spray.json._
@RunWith(classOf[JUnitRunner])
class CleanUpActivationsTest
diff --git a/tests/src/test/scala/whisk/core/entity/test/ActivationResponseTests.scala b/tests/src/test/scala/whisk/core/entity/test/ActivationResponseTests.scala
index 0324c032c1..6e388773d1 100644
--- a/tests/src/test/scala/whisk/core/entity/test/ActivationResponseTests.scala
+++ b/tests/src/test/scala/whisk/core/entity/test/ActivationResponseTests.scala
@@ -22,8 +22,7 @@ import org.junit.runner.RunWith
import org.scalatest.FlatSpec
import org.scalatest.Matchers
import org.scalatest.junit.JUnitRunner
-import spray.json.pimpAny
-import spray.json.pimpString
+import spray.json._
import whisk.common.PrintStreamLogging
import whisk.core.entity.ActivationResponse._
import whisk.core.entity.size.SizeInt
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services