diff options
| author | Ivan Topolnak <ivantopo@gmail.com> | 2013-10-04 16:12:29 -0300 |
|---|---|---|
| committer | Ivan Topolnak <ivantopo@gmail.com> | 2013-10-04 16:12:29 -0300 |
| commit | 20f9920d4704e28ee8aa066d151b522c0d14e166 (patch) | |
| tree | 09ba43ff7ad46223b0ecac8a2e3c6a7f525cfa2a /project | |
| parent | edbdd04d67893b4ebbcee1b1b08bc531219f04a9 (diff) | |
| download | Kamon-20f9920d4704e28ee8aa066d151b522c0d14e166.tar.gz Kamon-20f9920d4704e28ee8aa066d151b522c0d14e166.tar.bz2 Kamon-20f9920d4704e28ee8aa066d151b522c0d14e166.zip | |
Simplify logging instrumentation and integrate it with kamon-core, kamon-ouw is gone.
Diffstat (limited to 'project')
| -rw-r--r-- | project/Build.scala | 11 | ||||
| -rw-r--r-- | project/Dependencies.scala | 3 |
2 files changed, 5 insertions, 9 deletions
diff --git a/project/Build.scala b/project/Build.scala index 1e5c9a2f..022ff787 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -8,7 +8,7 @@ object Build extends Build { import Dependencies._ lazy val root = Project("root", file(".")) - .aggregate(kamonCore, kamonUow, kamonDashboard) + .aggregate(kamonCore, kamonDashboard) .settings(basicSettings: _*) .settings( publish := (), @@ -23,16 +23,11 @@ object Build extends Build { .settings( libraryDependencies ++= - compile(akkaActor, akkaAgent, aspectJ, aspectJWeaver, metrics, newrelic, sprayJson) ++ - provided(sprayCan, sprayClient, sprayRouting) ++ + compile(akkaActor, akkaAgent, aspectJ, aspectJWeaver, metrics, newrelic, sprayJson, logback, akkaSlf4j) ++ + compile(sprayCan, sprayClient, sprayRouting) ++ test(scalatest, akkaTestKit, sprayTestkit)) //.dependsOn(kamonDashboard) - lazy val kamonUow = Project("kamon-uow", file("kamon-uow")) - .settings(basicSettings: _*) - .settings(libraryDependencies ++= compile(akkaActor, akkaSlf4j, sprayRouting)) - .dependsOn(kamonCore) - lazy val kamonDashboard = Project("kamon-dashboard", file("kamon-dashboard")) .settings(basicSettings: _*) .settings(libraryDependencies ++= compile(akkaActor, akkaSlf4j, sprayRouting, sprayCan, sprayJson)) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 66852801..1a49d1d4 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -21,12 +21,13 @@ object Dependencies { val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % akkaVersion val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % akkaVersion val scalatest = "org.scalatest" % "scalatest_2.10" % "2.0.M6-SNAP22" - val logback = "ch.qos.logback" % "logback-classic" % "1.0.10" + val logback = "ch.qos.logback" % "logback-classic" % "1.0.13" val aspectJ = "org.aspectj" % "aspectjrt" % "1.7.2" val aspectJWeaver = "org.aspectj" % "aspectjweaver" % "1.7.2" val metrics = "com.codahale.metrics" % "metrics-core" % "3.0.0" val newrelic = "com.newrelic.agent.java" % "newrelic-api" % "2.19.0" + def compile (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "compile") def provided (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "provided") def test (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "test") |