diff options
| author | Diego Parra <diegolparra@gmail.com> | 2014-12-04 08:16:07 -0600 |
|---|---|---|
| committer | Diego Parra <diegolparra@gmail.com> | 2014-12-04 08:16:07 -0600 |
| commit | f2e3eec7cb324a183345f7338b152c4293721d38 (patch) | |
| tree | 2d9be3524a1b0df6c29c96a3e1b455f1147ab0ff /project/Projects.scala | |
| parent | 3905757c2eb9658d136c50de82180a74b002df7e (diff) | |
| parent | fe724251011c177aabdf2810dfb5d4eb3a97852c (diff) | |
| download | Kamon-f2e3eec7cb324a183345f7338b152c4293721d38.tar.gz Kamon-f2e3eec7cb324a183345f7338b152c4293721d38.tar.bz2 Kamon-f2e3eec7cb324a183345f7338b152c4293721d38.zip | |
Merge pull request #124 from carrot-garden/sigar-review-1
+ system-metrics: two-phase sigar loading
Diffstat (limited to 'project/Projects.scala')
| -rw-r--r-- | project/Projects.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/project/Projects.scala b/project/Projects.scala index aa583e2e..83bf13a0 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -42,7 +42,7 @@ object Projects extends Build { compile(akkaActor, hdrHistogram) ++ provided(aspectJ) ++ optional(logback, scalazConcurrent) ++ - test(scalatest, akkaTestKit, akkaSlf4j, logback)) + test(scalatest, akkaTestKit, akkaSlf4j, slf4Jul, slf4Log4j, logback)) lazy val kamonAkkaRemote = Project("kamon-akka-remote", file("kamon-akka-remote")) @@ -169,7 +169,7 @@ object Projects extends Build { .settings( libraryDependencies ++= compile(sigarLoader) ++ - test(scalatest, akkaTestKit, slf4Api, slf4nop)) + test(scalatest, akkaTestKit, slf4Api, slf4Jul, slf4Log4j, logback)) .dependsOn(kamonCore) lazy val kamonJdbc = Project("kamon-jdbc", file("kamon-jdbc")) |