diff --git a/build.sbt b/build.sbt index 361529e..249fe10 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ name := "spark-sql-perf" organization := "com.databricks" -scalaVersion := "2.10.4" +scalaVersion := "2.10.6" sparkPackageName := "databricks/spark-sql-perf" @@ -43,7 +43,7 @@ libraryDependencies += "org.scalatest" %% "scalatest" % "2.2.1" % "test" libraryDependencies += "org.yaml" % "snakeyaml" % "1.17" -libraryDependencies += "com.typesafe" %% "scalalogging-slf4j" % "1.1.0" +libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging-slf4j" % "2.1.2" fork := true diff --git a/src/main/scala/com/databricks/spark/sql/perf/Benchmarkable.scala b/src/main/scala/com/databricks/spark/sql/perf/Benchmarkable.scala index 6303843..f084da8 100644 --- a/src/main/scala/com/databricks/spark/sql/perf/Benchmarkable.scala +++ b/src/main/scala/com/databricks/spark/sql/perf/Benchmarkable.scala @@ -18,7 +18,7 @@ package com.databricks.spark.sql.perf import java.util.UUID -import com.typesafe.scalalogging.slf4j.Logging +import com.typesafe.scalalogging.slf4j.{LazyLogging => Logging} import scala.concurrent.duration._ import scala.collection.mutable.ArrayBuffer diff --git a/src/main/scala/com/databricks/spark/sql/perf/mllib/BenchmarkAlgorithm.scala b/src/main/scala/com/databricks/spark/sql/perf/mllib/BenchmarkAlgorithm.scala index 52415b4..a17e193 100644 --- a/src/main/scala/com/databricks/spark/sql/perf/mllib/BenchmarkAlgorithm.scala +++ b/src/main/scala/com/databricks/spark/sql/perf/mllib/BenchmarkAlgorithm.scala @@ -1,6 +1,6 @@ package com.databricks.spark.sql.perf.mllib -import com.typesafe.scalalogging.slf4j.Logging +import com.typesafe.scalalogging.slf4j.{LazyLogging => Logging} import org.apache.spark.ml.{Estimator, Transformer} import org.apache.spark.ml.evaluation.Evaluator diff --git a/src/main/scala/com/databricks/spark/sql/perf/mllib/MLLib.scala b/src/main/scala/com/databricks/spark/sql/perf/mllib/MLLib.scala index e59ad01..81df78f 100644 --- a/src/main/scala/com/databricks/spark/sql/perf/mllib/MLLib.scala +++ b/src/main/scala/com/databricks/spark/sql/perf/mllib/MLLib.scala @@ -4,7 +4,7 @@ import scala.language.implicitConversions import com.databricks.spark.sql.perf._ -import com.typesafe.scalalogging.slf4j.Logging +import com.typesafe.scalalogging.slf4j.{LazyLogging => Logging} import org.apache.spark.SparkContext import org.apache.spark.sql.{DataFrame, SQLContext} diff --git a/src/main/scala/com/databricks/spark/sql/perf/mllib/MLTransformerBenchmarkable.scala b/src/main/scala/com/databricks/spark/sql/perf/mllib/MLTransformerBenchmarkable.scala index 5ff65ca..4b0d100 100644 --- a/src/main/scala/com/databricks/spark/sql/perf/mllib/MLTransformerBenchmarkable.scala +++ b/src/main/scala/com/databricks/spark/sql/perf/mllib/MLTransformerBenchmarkable.scala @@ -1,7 +1,7 @@ package com.databricks.spark.sql.perf.mllib import com.databricks.spark.sql.perf._ -import com.typesafe.scalalogging.slf4j.Logging +import com.typesafe.scalalogging.slf4j.{LazyLogging => Logging} import org.apache.spark.sql._ import scala.collection.mutable.ArrayBuffer