diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 54fa96baa1e18..120ee9c886315 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -55,9 +55,14 @@ ${project.version} - com.typesafe - scalalogging-slf4j_${scala.binary.version} - 1.0.1 + com.typesafe.scala-logging + scala-logging-slf4j_${scala.binary.version} + 2.1.2 + + + com.typesafe.scala-logging + scala-logging-api_${scala.binary.version} + 2.1.2 org.scalatest diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala index 4211998f7511a..9523ba5414c3f 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala @@ -17,7 +17,7 @@ package org.apache.spark.sql.catalyst.expressions.codegen -import com.typesafe.scalalogging.slf4j.Logging +import com.typesafe.scalalogging.slf4j.{LazyLogging => Logging} import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.types.{StringType, NumericType} diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/package.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/package.scala index ca9642954eb27..2c5542cfafd1d 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/package.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/package.scala @@ -25,5 +25,5 @@ package object catalyst { */ protected[catalyst] object ScalaReflectionLock - protected[catalyst] type Logging = com.typesafe.scalalogging.slf4j.Logging + protected[catalyst] type Logging = com.typesafe.scalalogging.slf4j.LazyLogging } diff --git a/sql/core/pom.xml b/sql/core/pom.xml index c8016e41256d5..4846df99f6b52 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -83,6 +83,16 @@ scalacheck_${scala.binary.version} test + + com.typesafe.scala-logging + scala-logging-slf4j_${scala.binary.version} + 2.1.2 + + + com.typesafe.scala-logging + scala-logging-api_${scala.binary.version} + 2.1.2 + target/scala-${scala.binary.version}/classes diff --git a/sql/core/src/main/scala/org/apache/spark/sql/package.scala b/sql/core/src/main/scala/org/apache/spark/sql/package.scala index 0995a4eb6299f..3d386c1ca3656 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/package.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/package.scala @@ -32,7 +32,7 @@ import org.apache.spark.annotation.DeveloperApi */ package object sql { - protected[sql] type Logging = com.typesafe.scalalogging.slf4j.Logging + protected[sql] type Logging = com.typesafe.scalalogging.slf4j.LazyLogging /** * :: DeveloperApi ::