Skip to content

Commit db02628

Browse files
committed
DSP-13836 bump versions of spark, netty
and shiro. Revert akka downgrade (since now we are able to use newer one. Previously we wera unable to use newer once because of sbt-assebly bug akka/akka#21596) Please enter the commit message for your changes. Lines starting
1 parent ce48b52 commit db02628

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ lazy val root = Project(id = "root", base = file("."))
8989
.disablePlugins(SbtScalariform).enablePlugins(DockerPlugin)
9090

9191
lazy val jobServerExtrasSettings = revolverSettings ++ Assembly.settings ++ publishSettings ++ Seq(
92-
libraryDependencies ++= sparkExtraDeps,
92+
libraryDependencies ++= sparkExtraDeps ++ sparkExtraDepsTest,
9393
// Extras packages up its own jar for testing itself
9494
test in Test <<= (test in Test).dependsOn(packageBin in Compile)
9595
.dependsOn(clean in Compile),

project/Dependencies.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ object Dependencies {
4242
)
4343
)
4444

45+
lazy val sparkExtraDepsTest = Seq(
46+
"com.google.guava" % "guava" % "16.0.1" % Test force()
47+
)
48+
4549
lazy val sparkPythonDeps = Seq(
4650
"net.sf.py4j" % "py4j" % py4j,
4751
"io.spray" %% "spray-json" % sprayJson % Test

project/Versions.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import scala.util.Properties.isJavaAtLeast
22

33
object Versions {
4-
lazy val spark = sys.env.getOrElse("SPARK_VERSION", "2.1.0")
4+
lazy val spark = sys.env.getOrElse("SPARK_VERSION", "2.2.0")
55

66
lazy val akka = "2.4.9"
7-
lazy val cassandra = "3.0.3"
7+
lazy val cassandra = "3.2.0"
88
lazy val cassandraUnit = "2.2.2.1"
99
lazy val commons = "1.4"
1010
lazy val flyway = "3.2.1"
@@ -15,12 +15,12 @@ object Versions {
1515
lazy val logback = "1.0.7"
1616
lazy val mesos = sys.env.getOrElse("MESOS_VERSION", "1.0.0-2.0.89.ubuntu1404")
1717
lazy val metrics = "2.2.0"
18-
lazy val netty = "4.0.42.Final"
18+
lazy val netty = "4.0.44.Final"
1919
lazy val postgres = "9.4.1209"
2020
lazy val py4j = "0.10.4"
2121
lazy val scalaTest = "2.2.6"
2222
lazy val scalatic = "2.2.6"
23-
lazy val shiro = "1.2.4"
23+
lazy val shiro = "1.3.2"
2424
lazy val slick = "3.1.1"
2525
lazy val spray = "1.3.3"
2626
lazy val sprayJson = "1.3.2"

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0") // For quick restarts
66

77
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")
88

9-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")
9+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
1010

1111
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
1212

0 commit comments

Comments
 (0)