raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

=slf #3788 Update to logback 1.0.13 and slf4j 1.7.5

Browse source
This commit is contained in:
Patrik Nordwall 2013-12-11 15:33:30 +01:00
parent 3fdf20dfc6
commit ed5bb92b1f
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-docs/rst/java/logging.rst
View file

@ -258,7 +258,7 @@ It has one single dependency; the slf4j-api jar. In runtime you also need a SLF4
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.7</version>
<version>1.0.13</version>
</dependency>
You need to enable the Slf4jLogger in the 'loggers' element in

2
akka-docs/rst/scala/logging.rst
View file

@ -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

4
akka-sbt-plugin/sample/project/Build.scala
View file

@ -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"
}

4
project/AkkaBuild.scala
View file

@ -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