aboutsummaryrefslogtreecommitdiff
path: root/project/Dependencies.scala
diff options
context:
space:
mode:
authorAndrei Pozolotin <Andrei.Pozolotin@gmail.com>2014-12-03 10:27:17 -0600
committerAndrei Pozolotin <Andrei.Pozolotin@gmail.com>2014-12-04 08:02:56 -0600
commitfe724251011c177aabdf2810dfb5d4eb3a97852c (patch)
tree2d9be3524a1b0df6c29c96a3e1b455f1147ab0ff /project/Dependencies.scala
parent3905757c2eb9658d136c50de82180a74b002df7e (diff)
downloadKamon-fe724251011c177aabdf2810dfb5d4eb3a97852c.tar.gz
Kamon-fe724251011c177aabdf2810dfb5d4eb3a97852c.tar.bz2
Kamon-fe724251011c177aabdf2810dfb5d4eb3a97852c.zip
+ system-metrics: two-phase sigar loading
* update slf4jVersion * redirect JUL and LOG4J logging to SLF4J * use two-phase sigar loading
Diffstat (limited to 'project/Dependencies.scala')
-rw-r--r--project/Dependencies.scala4
1 files changed, 3 insertions, 1 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index c66d77a1..761db941 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -25,7 +25,7 @@ object Dependencies {
val sprayVersion = "1.3.2"
val akkaVersion = "2.3.6"
val aspectjVersion = "1.8.4"
- val slf4jVersion = "1.7.6"
+ val slf4jVersion = "1.7.7"
val playVersion = "2.3.5"
val sigarVersion = "1.6.5.132"
@@ -50,6 +50,8 @@ object Dependencies {
val playTest = "org.scalatestplus" %% "play" % "1.2.0"
val slf4Api = "org.slf4j" % "slf4j-api" % slf4jVersion
val slf4nop = "org.slf4j" % "slf4j-nop" % slf4jVersion
+ val slf4Jul = "org.slf4j" % "jul-to-slf4j" % slf4jVersion
+ val slf4Log4j = "org.slf4j" % "log4j-over-slf4j" % slf4jVersion
val scalaCompiler = "org.scala-lang" % "scala-compiler" % Settings.ScalaVersion
val scalazConcurrent = "org.scalaz" %% "scalaz-concurrent" % "7.1.0"
val sigarLoader = "io.kamon" % "sigar-loader" % "1.6.5-rev001"