From ec438ca2a6183289a0e61b947842bc50e18ba4a3 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Fri, 12 Oct 2012 14:15:00 +0200 Subject: [PATCH 1/2] Logback and slf4j dependencies, see #2615 * Latest slf4j 1.6.6 * Latest logback-classic 1.0.7 * Removed runtime scope for logback in docs --- akka-docs/rst/java/logging.rst | 3 +-- akka-docs/rst/scala/logging.rst | 2 +- project/AkkaBuild.scala | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/akka-docs/rst/java/logging.rst b/akka-docs/rst/java/logging.rst index eefce2b35d..0f857837c5 100644 --- a/akka-docs/rst/java/logging.rst +++ b/akka-docs/rst/java/logging.rst @@ -194,8 +194,7 @@ It has one single dependency; the slf4j-api jar. In runtime you also need a SLF4 ch.qos.logback logback-classic - 1.0.4 - runtime + 1.0.7 You need to enable the Slf4jEventHandler in the 'event-handlers' element in diff --git a/akka-docs/rst/scala/logging.rst b/akka-docs/rst/scala/logging.rst index 60cd3f2a61..f8c3e11f27 100644 --- a/akka-docs/rst/scala/logging.rst +++ b/akka-docs/rst/scala/logging.rst @@ -232,7 +232,7 @@ It has one single dependency; the slf4j-api jar. In runtime you also need a SLF4 .. code-block:: scala - lazy val logback = "ch.qos.logback" % "logback-classic" % "1.0.4" % "runtime" + lazy val logback = "ch.qos.logback" % "logback-classic" % "1.0.7" You need to enable the Slf4jEventHandler in the 'event-handlers' element in diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 00ea3b26a8..23698d3b1a 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -701,7 +701,7 @@ object Dependency { val protobuf = "com.google.protobuf" % "protobuf-java" % "2.4.1" // New BSD val scalaStm = "org.scala-tools" % "scala-stm" % "0.6" cross CrossVersion.full // Modified BSD (Scala) - val slf4jApi = "org.slf4j" % "slf4j-api" % "1.6.4" // MIT + val slf4jApi = "org.slf4j" % "slf4j-api" % "1.6.6" // MIT val zeroMQClient = "org.zeromq" % "zeromq-scala-binding" % "0.0.6" cross CrossVersion.full // ApacheV2 val uncommonsMath = "org.uncommons.maths" % "uncommons-maths" % "1.2.2a" // ApacheV2 val ariesBlueprint = "org.apache.aries.blueprint" % "org.apache.aries.blueprint" % "0.3.2" // ApacheV2 @@ -717,7 +717,7 @@ object Dependency { val commonsMath = "org.apache.commons" % "commons-math" % "2.1" % "test" // ApacheV2 val commonsIo = "commons-io" % "commons-io" % "2.0.1" % "test" // ApacheV2 val junit = "junit" % "junit" % "4.10" % "test" // Common Public License 1.0 - val logback = "ch.qos.logback" % "logback-classic" % "1.0.4" % "test" // EPL 1.0 / LGPL 2.1 + val logback = "ch.qos.logback" % "logback-classic" % "1.0.7" % "test" // EPL 1.0 / LGPL 2.1 val mockito = "org.mockito" % "mockito-all" % "1.8.1" % "test" // MIT val scalatest = "org.scalatest" % "scalatest" % "1.9-2.10.0-M7-B1" % "test" cross CrossVersion.full // ApacheV2 val scalacheck = "org.scalacheck" % "scalacheck" % "1.10.0" % "test" cross CrossVersion.full // New BSD From 76c158e63c5b21525c0820571e27cf6fa5b4cc51 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Fri, 12 Oct 2012 18:46:20 +0200 Subject: [PATCH 2/2] slf4j 1.7.2, see #2615 --- project/AkkaBuild.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 23698d3b1a..7d0789aaae 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -701,7 +701,7 @@ object Dependency { val protobuf = "com.google.protobuf" % "protobuf-java" % "2.4.1" // New BSD val scalaStm = "org.scala-tools" % "scala-stm" % "0.6" cross CrossVersion.full // Modified BSD (Scala) - val slf4jApi = "org.slf4j" % "slf4j-api" % "1.6.6" // MIT + val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.2" // MIT val zeroMQClient = "org.zeromq" % "zeromq-scala-binding" % "0.0.6" cross CrossVersion.full // ApacheV2 val uncommonsMath = "org.uncommons.maths" % "uncommons-maths" % "1.2.2a" // ApacheV2 val ariesBlueprint = "org.apache.aries.blueprint" % "org.apache.aries.blueprint" % "0.3.2" // ApacheV2