diff --git a/akka-docs/rst/java/logging.rst b/akka-docs/rst/java/logging.rst index 5eec1f9c31..83e40da63a 100644 --- a/akka-docs/rst/java/logging.rst +++ b/akka-docs/rst/java/logging.rst @@ -258,7 +258,7 @@ It has one single dependency; the slf4j-api jar. In runtime you also need a SLF4 ch.qos.logback logback-classic - 1.0.7 + 1.0.13 You need to enable the Slf4jLogger in the 'loggers' element in diff --git a/akka-docs/rst/scala/logging.rst b/akka-docs/rst/scala/logging.rst index ecec111f23..76be04baf7 100644 --- a/akka-docs/rst/scala/logging.rst +++ b/akka-docs/rst/scala/logging.rst @@ -296,7 +296,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.7" + lazy val logback = "ch.qos.logback" % "logback-classic" % "1.0.13" You need to enable the Slf4jLogger in the 'loggers' element in diff --git a/akka-sbt-plugin/sample/project/Build.scala b/akka-sbt-plugin/sample/project/Build.scala index 52582bcb12..5fd483fbb4 100644 --- a/akka-sbt-plugin/sample/project/Build.scala +++ b/akka-sbt-plugin/sample/project/Build.scala @@ -7,7 +7,7 @@ import akka.sbt.AkkaKernelPlugin.{ Dist, outputDirectory, distJvmOptions} object HelloKernelBuild extends Build { val Organization = "akka.sample" val Version = "2.3-SNAPSHOT" - val ScalaVersion = "2.10.2" + val ScalaVersion = "2.10.3" lazy val HelloKernel = Project( id = "hello-kernel", @@ -52,5 +52,5 @@ object Dependency { val akkaKernel = "com.typesafe.akka" %% "akka-kernel" % V.Akka val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % V.Akka - val logback = "ch.qos.logback" % "logback-classic" % "1.0.0" + val logback = "ch.qos.logback" % "logback-classic" % "1.0.13" } diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index b73358c725..be43861048 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -1107,7 +1107,7 @@ object Dependencies { val protobuf = "com.google.protobuf" % "protobuf-java" % "2.5.0" // New BSD val scalaStm = "org.scala-stm" %% "scala-stm" % scalaStmVersion // Modified BSD (Scala) - val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.2" // MIT + val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.5" // MIT val zeroMQClient = "org.zeromq" %% "zeromq-scala-binding" % scalaZeroMQVersion // ApacheV2 val uncommonsMath = "org.uncommons.maths" % "uncommons-maths" % "1.2.2a" exclude("jfree", "jcommon") exclude("jfree", "jfreechart") // ApacheV2 val ariesBlueprint = "org.apache.aries.blueprint" % "org.apache.aries.blueprint" % "1.1.0" // ApacheV2 @@ -1132,7 +1132,7 @@ object Dependencies { val commonsIo = "commons-io" % "commons-io" % "2.0.1" % "test" // ApacheV2 val commonsCodec = "commons-codec" % "commons-codec" % "1.7" % "test" // ApacheV2 val junit = "junit" % "junit" % "4.10" % "test" // Common Public License 1.0 - val logback = "ch.qos.logback" % "logback-classic" % "1.0.7" % "test" // EPL 1.0 / LGPL 2.1 + val logback = "ch.qos.logback" % "logback-classic" % "1.0.13" % "test" // EPL 1.0 / LGPL 2.1 val mockito = "org.mockito" % "mockito-all" % "1.8.1" % "test" // MIT // changing the scalatest dependency must be reflected in akka-docs/rst/dev/multi-jvm-testing.rst val scalatest = "org.scalatest" %% "scalatest" % scalaTestVersion % "test" // ApacheV2