Skip to content

GAWB-3824: Upgrade Akka again #987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2018
Merged

GAWB-3824: Upgrade Akka again #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ba3e99
Akka to 2.5.16. Akka HTTP to 10.1.5. scala-parser-combinators to 1.1.1.
breilly2 Sep 20, 2018
7beac54
Add explicit akka-stream dependency needed by Akka Http 10.1.
breilly2 Sep 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .../src/test/scala/org/broadinstitute/dsde/rawls/webservice/MethodConfigApiServiceSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ class MethodConfigApiServiceSpec extends ApiServiceSpec {
AgoraMethod("dsde", "good_and_bad", 1))

val expectedSuccessInputs = Seq("goodAndBad.goodAndBadTask.good_in")
val expectedFailureInputs = Map("goodAndBad.goodAndBadTask.bad_in" -> "Failed at line 1, column 1: `workspace.' expected but `d' found")
val expectedFailureInputs = Map("goodAndBad.goodAndBadTask.bad_in" -> "Failed at line 1, column 1: 'workspace.' expected but 'd' found")
val expectedSuccessOutputs = Seq("goodAndBad.goodAndBadTask.good_out", "empty_out")
val expectedFailureOutputs = Map("goodAndBad.goodAndBadTask.bad_out" -> "Failed at line 1, column 1: `workspace.' expected but `a' found")
val expectedFailureOutputs = Map("goodAndBad.goodAndBadTask.bad_out" -> "Failed at line 1, column 1: 'workspace.' expected but 'a' found")

Post(s"${testData.workspace.path}/methodconfigs", httpJson(newMethodConfig)) ~>
sealRoute(services.methodConfigRoutes) ~>
Expand Down Expand Up @@ -141,7 +141,7 @@ class MethodConfigApiServiceSpec extends ApiServiceSpec {
AgoraMethod("dsde", "good_and_bad", 1))

val expectedSuccessInputs = Seq("goodAndBad.goodAndBadTask.good_in")
val expectedFailureInputs = Map("goodAndBad.goodAndBadTask.bad_in" -> "Failed at line 1, column 1: `workspace.' expected but `b' found")
val expectedFailureInputs = Map("goodAndBad.goodAndBadTask.bad_in" -> "Failed at line 1, column 1: 'workspace.' expected but 'b' found")
val expectedSuccessOutputs = Seq("goodAndBad.goodAndBadTask.good_out", "empty_out")
val expectedFailureOutputs = Map("goodAndBad.goodAndBadTask.bad_out" -> "Expressions beginning with \"this.\" are only allowed when running with workspace data model. However, workspace attributes can be used.")

Expand Down Expand Up @@ -521,9 +521,9 @@ class MethodConfigApiServiceSpec extends ApiServiceSpec {

def checkValidAttributeSyntax(httpMethod: RequestBuilder) = withTestDataApiServices { services =>
val expectedSuccessInputs = Seq("goodAndBad.goodAndBadTask.good_in")
val expectedFailureInputs = Map("goodAndBad.goodAndBadTask.bad_in" -> "Failed at line 1, column 1: `workspace.' expected but `d' found")
val expectedFailureInputs = Map("goodAndBad.goodAndBadTask.bad_in" -> "Failed at line 1, column 1: 'workspace.' expected but 'd' found")
val expectedSuccessOutputs = Seq("goodAndBad.goodAndBadTask.good_out", "empty_out")
val expectedFailureOutputs = Map("goodAndBad.goodAndBadTask.bad_out" -> "Failed at line 1, column 1: `workspace.' expected but `a' found")
val expectedFailureOutputs = Map("goodAndBad.goodAndBadTask.bad_out" -> "Failed at line 1, column 1: 'workspace.' expected but 'a' found")

httpMethod(testData.goodAndBadMethodConfig.path(testData.workspace), httpJson(testData.goodAndBadMethodConfig)) ~>
sealRoute(services.methodConfigRoutes) ~>
Expand Down Expand Up @@ -638,9 +638,9 @@ class MethodConfigApiServiceSpec extends ApiServiceSpec {
val theOutputs = Map("goodAndBad.goodAndBadTask.good_out" -> AttributeString("this.bar"), "goodAndBad.goodAndBadTask.bad_out" -> AttributeString("also.does.not.parse"), "goodAndBad.goodAndBadTask.empty_out" -> AttributeString(""))

val expectedSuccessInputs = Seq("goodAndBad.goodAndBadTask.good_in")
val expectedFailureInputs = Map("goodAndBad.goodAndBadTask.bad_in" -> "Failed at line 1, column 1: `workspace.' expected but `d' found")
val expectedFailureInputs = Map("goodAndBad.goodAndBadTask.bad_in" -> "Failed at line 1, column 1: 'workspace.' expected but 'd' found")
val expectedSuccessOutputs = Seq("goodAndBad.goodAndBadTask.good_out", "goodAndBad.goodAndBadTask.empty_out")
val expectedFailureOutputs = Map("goodAndBad.goodAndBadTask.bad_out" -> "Failed at line 1, column 1: `workspace.' expected but `a' found")
val expectedFailureOutputs = Map("goodAndBad.goodAndBadTask.bad_out" -> "Failed at line 1, column 1: 'workspace.' expected but 'a' found")

val mc = testData.goodAndBadMethodConfig.copy(name = "blah",inputs = theInputs, outputs = theOutputs)

Expand Down
11 changes: 8 additions & 3 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import sbt._

object Dependencies {
val akkaV = "2.4.20" // 2.5.14 works but 2.5.15+ causes an obscure test failure; sticking with 2.4 for now
val akkaHttpV = "10.0.14" // can't go to 10.1.x without going to akka 2.5.x
val akkaV = "2.5.16"
val akkaHttpV = "10.1.5"
val slickV = "3.2.1"

val googleV = "1.22.0"
Expand All @@ -19,6 +19,7 @@ object Dependencies {
val excludeAkkaStream = ExclusionRule(organization = "com.typesafe.akka", name = "akka-stream_2.12")

val akkaActor: ModuleID = "com.typesafe.akka" %% "akka-actor" % akkaV
val akkaStream: ModuleID = "com.typesafe.akka" %% "akka-stream" % akkaV
val akkaContrib: ModuleID = "com.typesafe.akka" %% "akka-contrib" % akkaV
val akkaSlf4j: ModuleID = "com.typesafe.akka" %% "akka-slf4j" % akkaV
val akkaHttp: ModuleID = "com.typesafe.akka" %% "akka-http" % akkaHttpV excludeAll(excludeAkkaActor, excludeAkkaStream)
Expand Down Expand Up @@ -56,7 +57,7 @@ object Dependencies {
val commonsJEXL: ModuleID = "org.apache.commons" % "commons-jexl" % "2.1.1"
val httpClient: ModuleID = "org.apache.httpcomponents" % "httpclient" % "4.5.3" // upgrading a transitive dependency to avoid security warnings
val cats: ModuleID = "org.typelevel" %% "cats" % "0.9.0"
val parserCombinators = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.6"
val parserCombinators = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1"
val mysqlConnector: ModuleID = "mysql" % "mysql-connector-java" % "5.1.42"
val liquibaseCore: ModuleID = "org.liquibase" % "liquibase-core" % "3.5.3"
val logbackClassic: ModuleID = "ch.qos.logback" % "logback-classic" % "1.2.2"
Expand Down Expand Up @@ -84,13 +85,15 @@ object Dependencies {
metricsScala,
metricsStatsd,
akkaHttp,
akkaStream,
scalatest,
mockito
)

val googleDependencies = metricsDependencies ++ Seq(
akkaHttpSprayJson,
akkaHttp,
akkaStream,
akkaActor,
akkaHttpTestKit,
scalatest,
Expand Down Expand Up @@ -123,6 +126,7 @@ object Dependencies {
jacksonCore,
akkaHttpSprayJson,
akkaHttp,
akkaStream,
jodaTime,
jodaConvert,
scalaLogging,
Expand All @@ -139,6 +143,7 @@ object Dependencies {
slick,
slickHikariCP,
akkaHttp,
akkaStream,
swaggerUI,
commonsJEXL,
cromwellWdl,
Expand Down