Permalink
Browse files

Upgrade to SLF4J 1.7.1

  • Loading branch information...
1 parent 39711d0 commit d14ab45405418f9cda0759cb7b82a5df260650a5 Heiko Seeberger committed Oct 4, 2012
View
@@ -99,7 +99,7 @@ object Build extends Build {
object Compile {
val ScalaReflect = "org.scala-lang" % "scala-reflect" % ScalaVersion
- val Slf4jApi = "org.slf4j" % "slf4j-api" % "1.6.6"
+ val Slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.1"
val Log4jApi = "org.apache.logging.log4j" % "log4j-api" % "2.0-beta1"
}
@@ -26,7 +26,7 @@ object Log4jLoggerSpec extends Specification with Mockito {
private val AnyRefMessage = new AnyRef
- private val Cause = new Exception("Exception")
+ private val Throwable = new Exception("Exception")
private val Marker = MarkerManager getMarker "Marker"
@@ -41,18 +41,18 @@ object Log4jLoggerSpec extends Specification with Mockito {
there was no(underlying).fatal(Message)
logger.fatal(Marker, Message)
there was no(underlying).fatal(Marker, Message)
- logger.fatal(Message, Cause)
- there was no(underlying).fatal(Message, Cause)
- logger.fatal(Marker, Message, Cause)
- there was no(underlying).fatal(Marker, Message, Cause)
+ logger.fatal(Message, Throwable)
+ there was no(underlying).fatal(Message, Throwable)
+ logger.fatal(Marker, Message, Throwable)
+ there was no(underlying).fatal(Marker, Message, Throwable)
logger.fatal(AnyRefMessage)
there was no(underlying).fatal(AnyRefMessage)
logger.fatal(Marker, AnyRefMessage)
there was no(underlying).fatal(Marker, AnyRefMessage)
- logger.fatal(AnyRefMessage, Cause)
- there was no(underlying).fatal(AnyRefMessage, Cause)
- logger.fatal(Marker, AnyRefMessage, Cause)
- there was no(underlying).fatal(Marker, AnyRefMessage, Cause)
+ logger.fatal(AnyRefMessage, Throwable)
+ there was no(underlying).fatal(AnyRefMessage, Throwable)
+ logger.fatal(Marker, AnyRefMessage, Throwable)
+ there was no(underlying).fatal(Marker, AnyRefMessage, Throwable)
logger.fatal(Message, Params: _*)
there was no(underlying).fatal(Message, Params: _*)
logger.fatal(Marker, Message, Params: _*)
@@ -66,18 +66,18 @@ object Log4jLoggerSpec extends Specification with Mockito {
there was one(underlying).fatal(Message)
logger.fatal(Marker, Message)
there was one(underlying).fatal(Marker, Message)
- logger.fatal(Message, Cause)
- there was one(underlying).fatal(Message, Cause)
- logger.fatal(Marker, Message, Cause)
- there was one(underlying).fatal(Marker, Message, Cause)
+ logger.fatal(Message, Throwable)
+ there was one(underlying).fatal(Message, Throwable)
+ logger.fatal(Marker, Message, Throwable)
+ there was one(underlying).fatal(Marker, Message, Throwable)
logger.fatal(AnyRefMessage)
there was one(underlying).fatal(AnyRefMessage)
logger.fatal(Marker, AnyRefMessage)
there was one(underlying).fatal(Marker, AnyRefMessage)
- logger.fatal(AnyRefMessage, Cause)
- there was one(underlying).fatal(AnyRefMessage, Cause)
- logger.fatal(Marker, AnyRefMessage, Cause)
- there was one(underlying).fatal(Marker, AnyRefMessage, Cause)
+ logger.fatal(AnyRefMessage, Throwable)
+ there was one(underlying).fatal(AnyRefMessage, Throwable)
+ logger.fatal(Marker, AnyRefMessage, Throwable)
+ there was one(underlying).fatal(Marker, AnyRefMessage, Throwable)
logger.fatal(Message, Params: _*)
there was one(underlying).fatal(Message, Params: _*)
logger.fatal(Marker, Message, Params: _*)
@@ -94,18 +94,18 @@ object Log4jLoggerSpec extends Specification with Mockito {
there was no(underlying).error(Message)
logger.error(Marker, Message)
there was no(underlying).error(Marker, Message)
- logger.error(Message, Cause)
- there was no(underlying).error(Message, Cause)
- logger.error(Marker, Message, Cause)
- there was no(underlying).error(Marker, Message, Cause)
+ logger.error(Message, Throwable)
+ there was no(underlying).error(Message, Throwable)
+ logger.error(Marker, Message, Throwable)
+ there was no(underlying).error(Marker, Message, Throwable)
logger.error(AnyRefMessage)
there was no(underlying).error(AnyRefMessage)
logger.error(Marker, AnyRefMessage)
there was no(underlying).error(Marker, AnyRefMessage)
- logger.error(AnyRefMessage, Cause)
- there was no(underlying).error(AnyRefMessage, Cause)
- logger.error(Marker, AnyRefMessage, Cause)
- there was no(underlying).error(Marker, AnyRefMessage, Cause)
+ logger.error(AnyRefMessage, Throwable)
+ there was no(underlying).error(AnyRefMessage, Throwable)
+ logger.error(Marker, AnyRefMessage, Throwable)
+ there was no(underlying).error(Marker, AnyRefMessage, Throwable)
logger.error(Message, Params: _*)
there was no(underlying).error(Message, Params: _*)
logger.error(Marker, Message, Params: _*)
@@ -119,18 +119,18 @@ object Log4jLoggerSpec extends Specification with Mockito {
there was one(underlying).error(Message)
logger.error(Marker, Message)
there was one(underlying).error(Marker, Message)
- logger.error(Message, Cause)
- there was one(underlying).error(Message, Cause)
- logger.error(Marker, Message, Cause)
- there was one(underlying).error(Marker, Message, Cause)
+ logger.error(Message, Throwable)
+ there was one(underlying).error(Message, Throwable)
+ logger.error(Marker, Message, Throwable)
+ there was one(underlying).error(Marker, Message, Throwable)
logger.error(AnyRefMessage)
there was one(underlying).error(AnyRefMessage)
logger.error(Marker, AnyRefMessage)
there was one(underlying).error(Marker, AnyRefMessage)
- logger.error(AnyRefMessage, Cause)
- there was one(underlying).error(AnyRefMessage, Cause)
- logger.error(Marker, AnyRefMessage, Cause)
- there was one(underlying).error(Marker, AnyRefMessage, Cause)
+ logger.error(AnyRefMessage, Throwable)
+ there was one(underlying).error(AnyRefMessage, Throwable)
+ logger.error(Marker, AnyRefMessage, Throwable)
+ there was one(underlying).error(Marker, AnyRefMessage, Throwable)
logger.error(Message, Params: _*)
there was one(underlying).error(Message, Params: _*)
logger.error(Marker, Message, Params: _*)
@@ -147,18 +147,18 @@ object Log4jLoggerSpec extends Specification with Mockito {
there was no(underlying).warn(Message)
logger.warn(Marker, Message)
there was no(underlying).warn(Marker, Message)
- logger.warn(Message, Cause)
- there was no(underlying).warn(Message, Cause)
- logger.warn(Marker, Message, Cause)
- there was no(underlying).warn(Marker, Message, Cause)
+ logger.warn(Message, Throwable)
+ there was no(underlying).warn(Message, Throwable)
+ logger.warn(Marker, Message, Throwable)
+ there was no(underlying).warn(Marker, Message, Throwable)
logger.warn(AnyRefMessage)
there was no(underlying).warn(AnyRefMessage)
logger.warn(Marker, AnyRefMessage)
there was no(underlying).warn(Marker, AnyRefMessage)
- logger.warn(AnyRefMessage, Cause)
- there was no(underlying).warn(AnyRefMessage, Cause)
- logger.warn(Marker, AnyRefMessage, Cause)
- there was no(underlying).warn(Marker, AnyRefMessage, Cause)
+ logger.warn(AnyRefMessage, Throwable)
+ there was no(underlying).warn(AnyRefMessage, Throwable)
+ logger.warn(Marker, AnyRefMessage, Throwable)
+ there was no(underlying).warn(Marker, AnyRefMessage, Throwable)
logger.warn(Message, Params: _*)
there was no(underlying).warn(Message, Params: _*)
logger.warn(Marker, Message, Params: _*)
@@ -172,18 +172,18 @@ object Log4jLoggerSpec extends Specification with Mockito {
there was one(underlying).warn(Message)
logger.warn(Marker, Message)
there was one(underlying).warn(Marker, Message)
- logger.warn(Message, Cause)
- there was one(underlying).warn(Message, Cause)
- logger.warn(Marker, Message, Cause)
- there was one(underlying).warn(Marker, Message, Cause)
+ logger.warn(Message, Throwable)
+ there was one(underlying).warn(Message, Throwable)
+ logger.warn(Marker, Message, Throwable)
+ there was one(underlying).warn(Marker, Message, Throwable)
logger.warn(AnyRefMessage)
there was one(underlying).warn(AnyRefMessage)
logger.warn(Marker, AnyRefMessage)
there was one(underlying).warn(Marker, AnyRefMessage)
- logger.warn(AnyRefMessage, Cause)
- there was one(underlying).warn(AnyRefMessage, Cause)
- logger.warn(Marker, AnyRefMessage, Cause)
- there was one(underlying).warn(Marker, AnyRefMessage, Cause)
+ logger.warn(AnyRefMessage, Throwable)
+ there was one(underlying).warn(AnyRefMessage, Throwable)
+ logger.warn(Marker, AnyRefMessage, Throwable)
+ there was one(underlying).warn(Marker, AnyRefMessage, Throwable)
logger.warn(Message, Params: _*)
there was one(underlying).warn(Message, Params: _*)
logger.warn(Marker, Message, Params: _*)
@@ -200,18 +200,18 @@ object Log4jLoggerSpec extends Specification with Mockito {
there was no(underlying).info(Message)
logger.info(Marker, Message)
there was no(underlying).info(Marker, Message)
- logger.info(Message, Cause)
- there was no(underlying).info(Message, Cause)
- logger.info(Marker, Message, Cause)
- there was no(underlying).info(Marker, Message, Cause)
+ logger.info(Message, Throwable)
+ there was no(underlying).info(Message, Throwable)
+ logger.info(Marker, Message, Throwable)
+ there was no(underlying).info(Marker, Message, Throwable)
logger.info(AnyRefMessage)
there was no(underlying).info(AnyRefMessage)
logger.info(Marker, AnyRefMessage)
there was no(underlying).info(Marker, AnyRefMessage)
- logger.info(AnyRefMessage, Cause)
- there was no(underlying).info(AnyRefMessage, Cause)
- logger.info(Marker, AnyRefMessage, Cause)
- there was no(underlying).info(Marker, AnyRefMessage, Cause)
+ logger.info(AnyRefMessage, Throwable)
+ there was no(underlying).info(AnyRefMessage, Throwable)
+ logger.info(Marker, AnyRefMessage, Throwable)
+ there was no(underlying).info(Marker, AnyRefMessage, Throwable)
logger.info(Message, Params: _*)
there was no(underlying).info(Message, Params: _*)
logger.info(Marker, Message, Params: _*)
@@ -225,18 +225,18 @@ object Log4jLoggerSpec extends Specification with Mockito {
there was one(underlying).info(Message)
logger.info(Marker, Message)
there was one(underlying).info(Marker, Message)
- logger.info(Message, Cause)
- there was one(underlying).info(Message, Cause)
- logger.info(Marker, Message, Cause)
- there was one(underlying).info(Marker, Message, Cause)
+ logger.info(Message, Throwable)
+ there was one(underlying).info(Message, Throwable)
+ logger.info(Marker, Message, Throwable)
+ there was one(underlying).info(Marker, Message, Throwable)
logger.info(AnyRefMessage)
there was one(underlying).info(AnyRefMessage)
logger.info(Marker, AnyRefMessage)
there was one(underlying).info(Marker, AnyRefMessage)
- logger.info(AnyRefMessage, Cause)
- there was one(underlying).info(AnyRefMessage, Cause)
- logger.info(Marker, AnyRefMessage, Cause)
- there was one(underlying).info(Marker, AnyRefMessage, Cause)
+ logger.info(AnyRefMessage, Throwable)
+ there was one(underlying).info(AnyRefMessage, Throwable)
+ logger.info(Marker, AnyRefMessage, Throwable)
+ there was one(underlying).info(Marker, AnyRefMessage, Throwable)
logger.info(Message, Params: _*)
there was one(underlying).info(Message, Params: _*)
logger.info(Marker, Message, Params: _*)
@@ -253,18 +253,18 @@ object Log4jLoggerSpec extends Specification with Mockito {
there was no(underlying).debug(Message)
logger.debug(Marker, Message)
there was no(underlying).debug(Marker, Message)
- logger.debug(Message, Cause)
- there was no(underlying).debug(Message, Cause)
- logger.debug(Marker, Message, Cause)
- there was no(underlying).debug(Marker, Message, Cause)
+ logger.debug(Message, Throwable)
+ there was no(underlying).debug(Message, Throwable)
+ logger.debug(Marker, Message, Throwable)
+ there was no(underlying).debug(Marker, Message, Throwable)
logger.debug(AnyRefMessage)
there was no(underlying).debug(AnyRefMessage)
logger.debug(Marker, AnyRefMessage)
there was no(underlying).debug(Marker, AnyRefMessage)
- logger.debug(AnyRefMessage, Cause)
- there was no(underlying).debug(AnyRefMessage, Cause)
- logger.debug(Marker, AnyRefMessage, Cause)
- there was no(underlying).debug(Marker, AnyRefMessage, Cause)
+ logger.debug(AnyRefMessage, Throwable)
+ there was no(underlying).debug(AnyRefMessage, Throwable)
+ logger.debug(Marker, AnyRefMessage, Throwable)
+ there was no(underlying).debug(Marker, AnyRefMessage, Throwable)
logger.debug(Message, Params: _*)
there was no(underlying).debug(Message, Params: _*)
logger.debug(Marker, Message, Params: _*)
@@ -278,18 +278,18 @@ object Log4jLoggerSpec extends Specification with Mockito {
there was one(underlying).debug(Message)
logger.debug(Marker, Message)
there was one(underlying).debug(Marker, Message)
- logger.debug(Message, Cause)
- there was one(underlying).debug(Message, Cause)
- logger.debug(Marker, Message, Cause)
- there was one(underlying).debug(Marker, Message, Cause)
+ logger.debug(Message, Throwable)
+ there was one(underlying).debug(Message, Throwable)
+ logger.debug(Marker, Message, Throwable)
+ there was one(underlying).debug(Marker, Message, Throwable)
logger.debug(AnyRefMessage)
there was one(underlying).debug(AnyRefMessage)
logger.debug(Marker, AnyRefMessage)
there was one(underlying).debug(Marker, AnyRefMessage)
- logger.debug(AnyRefMessage, Cause)
- there was one(underlying).debug(AnyRefMessage, Cause)
- logger.debug(Marker, AnyRefMessage, Cause)
- there was one(underlying).debug(Marker, AnyRefMessage, Cause)
+ logger.debug(AnyRefMessage, Throwable)
+ there was one(underlying).debug(AnyRefMessage, Throwable)
+ logger.debug(Marker, AnyRefMessage, Throwable)
+ there was one(underlying).debug(Marker, AnyRefMessage, Throwable)
logger.debug(Message, Params: _*)
there was one(underlying).debug(Message, Params: _*)
logger.debug(Marker, Message, Params: _*)
@@ -306,18 +306,18 @@ object Log4jLoggerSpec extends Specification with Mockito {
there was no(underlying).trace(Message)
logger.trace(Marker, Message)
there was no(underlying).trace(Marker, Message)
- logger.trace(Message, Cause)
- there was no(underlying).trace(Message, Cause)
- logger.trace(Marker, Message, Cause)
- there was no(underlying).trace(Marker, Message, Cause)
+ logger.trace(Message, Throwable)
+ there was no(underlying).trace(Message, Throwable)
+ logger.trace(Marker, Message, Throwable)
+ there was no(underlying).trace(Marker, Message, Throwable)
logger.trace(AnyRefMessage)
there was no(underlying).trace(AnyRefMessage)
logger.trace(Marker, AnyRefMessage)
there was no(underlying).trace(Marker, AnyRefMessage)
- logger.trace(AnyRefMessage, Cause)
- there was no(underlying).trace(AnyRefMessage, Cause)
- logger.trace(Marker, AnyRefMessage, Cause)
- there was no(underlying).trace(Marker, AnyRefMessage, Cause)
+ logger.trace(AnyRefMessage, Throwable)
+ there was no(underlying).trace(AnyRefMessage, Throwable)
+ logger.trace(Marker, AnyRefMessage, Throwable)
+ there was no(underlying).trace(Marker, AnyRefMessage, Throwable)
logger.trace(Message, Params: _*)
there was no(underlying).trace(Message, Params: _*)
logger.trace(Marker, Message, Params: _*)
@@ -331,18 +331,18 @@ object Log4jLoggerSpec extends Specification with Mockito {
there was one(underlying).trace(Message)
logger.trace(Marker, Message)
there was one(underlying).trace(Marker, Message)
- logger.trace(Message, Cause)
- there was one(underlying).trace(Message, Cause)
- logger.trace(Marker, Message, Cause)
- there was one(underlying).trace(Marker, Message, Cause)
+ logger.trace(Message, Throwable)
+ there was one(underlying).trace(Message, Throwable)
+ logger.trace(Marker, Message, Throwable)
+ there was one(underlying).trace(Marker, Message, Throwable)
logger.trace(AnyRefMessage)
there was one(underlying).trace(AnyRefMessage)
logger.trace(Marker, AnyRefMessage)
there was one(underlying).trace(Marker, AnyRefMessage)
- logger.trace(AnyRefMessage, Cause)
- there was one(underlying).trace(AnyRefMessage, Cause)
- logger.trace(Marker, AnyRefMessage, Cause)
- there was one(underlying).trace(Marker, AnyRefMessage, Cause)
+ logger.trace(AnyRefMessage, Throwable)
+ there was one(underlying).trace(AnyRefMessage, Throwable)
+ logger.trace(Marker, AnyRefMessage, Throwable)
+ there was one(underlying).trace(Marker, AnyRefMessage, Throwable)
logger.trace(Message, Params: _*)
there was one(underlying).trace(Message, Params: _*)
logger.trace(Marker, Message, Params: _*)
@@ -378,5 +378,4 @@ private object LoggerMacros {
)
c.Expr(If(isEnabled, log, Literal(Constant(()))))
}
-
-}
+}
Oops, something went wrong.

0 comments on commit d14ab45

Please sign in to comment.