Skip to content

Commit

Permalink
[ROCK-1378] Fix XD server magic in analytic (#15)
Browse files Browse the repository at this point in the history
* update deps

* update plugins
  • Loading branch information
mleida-stratio authored Feb 19, 2020
1 parent 630c335 commit 26d3315
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 33 deletions.
44 changes: 22 additions & 22 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ crossScalaVersions in ThisBuild := Seq("2.11.12")
scalaVersion in ThisBuild := (crossScalaVersions in ThisBuild).value.head
Dependencies.sparkVersion in ThisBuild := {
val envVar = "APACHE_SPARK_VERSION"
val defaultVersion = "2.4.4"
val defaultVersion = "2.0.0"

Properties.envOrNone(envVar) match {
case None =>
Expand Down Expand Up @@ -104,15 +104,15 @@ pomExtra in ThisBuild := {
<artifactId>apache</artifactId>
<version>10</version>
</parent>
<url>http://toree.incubator.apache.org/</url>
<scm>
<url>git@github.com:apache/incubator-toree.git</url>
<connection>scm:git:git@github.com:apache/incubator-toree.git</connection>
<developerConnection>
scm:git:https://git-wip-us.apache.org/repos/asf/incubator-toree.git
</developerConnection>
<tag>HEAD</tag>
</scm>
<url>http://toree.incubator.apache.org/</url>
<scm>
<url>git@github.com:apache/incubator-toree.git</url>
<connection>scm:git:git@github.com:apache/incubator-toree.git</connection>
<developerConnection>
scm:git:https://git-wip-us.apache.org/repos/asf/incubator-toree.git
</developerConnection>
<tag>HEAD</tag>
</scm>
}
credentials in ThisBuild+= Credentials(Path.userHome / ".ivy2" / ".credentials")

Expand Down Expand Up @@ -159,37 +159,37 @@ lazy val communication = (project in file("communication"))
.dependsOn(macros, protocol)

/**
* Project representing the kernel-api code used by the Spark Kernel. Others can
* import this to implement their own magics and plugins.
*/
* Project representing the kernel-api code used by the Spark Kernel. Others can
* import this to implement their own magics and plugins.
*/
lazy val kernelApi = (project in file("kernel-api"))
.settings(name := "toree-kernel-api")
.dependsOn(macros, plugins)

/**
* Project representing the client code for connecting to the kernel backend.
*/
* Project representing the client code for connecting to the kernel backend.
*/
lazy val client = (project in file("client"))
.settings(name := "toree-client")
.dependsOn(macros, protocol, communication)

/**
* Project represents the scala interpreter used by the Spark Kernel.
*/
* Project represents the scala interpreter used by the Spark Kernel.
*/
lazy val scalaInterpreter = (project in file("scala-interpreter"))
.settings(name := "toree-scala-interpreter")
.dependsOn(plugins, protocol, kernelApi)

/**
* Project represents the SQL interpreter used by the Spark Kernel.
*/
* Project represents the SQL interpreter used by the Spark Kernel.
*/
lazy val sqlInterpreter = (project in file("sql-interpreter"))
.settings(name := "toree-sql-interpreter")
.dependsOn(plugins, protocol, kernelApi, scalaInterpreter)

/**
* Project representing the kernel code for the Spark Kernel backend.
*/
* Project representing the kernel code for the Spark Kernel backend.
*/
lazy val kernel = (project in file("kernel"))
.settings(name := "toree-kernel")
.dependsOn(
Expand Down Expand Up @@ -222,4 +222,4 @@ assemblyShadeRules in assembly := Seq(

test in assembly := {}
assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)
aggregate in assembly := false
aggregate in assembly := false
12 changes: 6 additions & 6 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ object Dependencies {

// Libraries

val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.5.19" // Apache v2
val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % "2.5.19" // Apache v2
val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % "2.5.19" // Apache v2
val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.5.27" // Apache v2
val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % "2.5.27" // Apache v2
val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % "2.5.27" // Apache v2

val clapper = "org.clapper" %% "classutil" % "1.0.12" // BSD 3-clause license, used for detecting plugins

Expand All @@ -39,7 +39,7 @@ object Dependencies {
val ivy = "org.apache.ivy" % "ivy" % "2.4.0" // Apache v2

// use the same jackson version in test than the one provided at runtime by Spark 2.0.0
val jacksonDatabind = "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.1" // Apache v2
val jacksonDatabind = "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.5" // Apache v2

val jeroMq = "org.zeromq" % "jeromq" % "0.4.3" // MPL v2

Expand All @@ -65,7 +65,7 @@ object Dependencies {
val sparkSql = Def.setting{ "org.apache.spark" %% "spark-sql" % sparkVersion.value } // Apache v2
val sparkStreaming = Def.setting{ "org.apache.spark" %% "spark-streaming" % sparkVersion.value } // Apache v2

val springCore = "org.springframework" % "spring-core" % "4.3.18.RELEASE"// Apache v2
val springCore = "org.springframework" % "spring-core" % "5.2.3.RELEASE"// Apache v2

val guava = "com.google.guava" % "guava" % "14.0.1" // Apache v2

Expand All @@ -88,4 +88,4 @@ object Dependencies {
)
}

}
}
10 changes: 5 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
logLevel := Level.Warn

// Provides the ability to generate unifed documentation for multiple projects
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2")

// Provides abilit to create an uber-jar
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")

// Provides a generated build info object to sync between build and application
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")

// Used for signing jars published via `sbt publish-signed`
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")

// Provides the ability to generate dependency graphs
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.0")
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")

0 comments on commit 26d3315

Please sign in to comment.