diff options
Diffstat (limited to 'project')
-rw-r--r-- | project/Dependencies.scala | 8 | ||||
-rw-r--r-- | project/Projects.scala | 34 |
2 files changed, 21 insertions, 21 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e7aaa14f..dd200757 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -46,10 +46,10 @@ object Dependencies { val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % akkaVersion val akkaRemote = "com.typesafe.akka" %% "akka-remote" % akkaVersion val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % akkaVersion - 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 slf4jApi = "org.slf4j" % "slf4j-api" % slf4jVersion + val slf4jnop = "org.slf4j" % "slf4j-nop" % slf4jVersion + val slf4jJul = "org.slf4j" % "jul-to-slf4j" % slf4jVersion + val slf4jLog4j = "org.slf4j" % "log4j-over-slf4j" % slf4jVersion val scalazConcurrent = "org.scalaz" %% "scalaz-concurrent" % "7.1.0" val sigarLoader = "io.kamon" % "sigar-loader" % "1.6.5-rev002" val h2 = "com.h2database" % "h2" % "1.4.182" diff --git a/project/Projects.scala b/project/Projects.scala index a68677ef..9a199797 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -36,10 +36,10 @@ object Projects extends Build { .settings( javacOptions in Compile ++= Seq("-XDignore.symbol.file"), libraryDependencies ++= - compile(akkaActor, hdrHistogram, typesafeConfig) ++ + compile(akkaActor, hdrHistogram, typesafeConfig, slf4jApi) ++ provided(aspectJ) ++ optional(logback) ++ - test(scalatest, akkaTestKit, akkaSlf4j, slf4Jul, slf4Log4j, logback)) + test(scalatest, akkaTestKit, akkaSlf4j, slf4jJul, slf4jLog4j, logback)) lazy val kamonAkka = Project("kamon-akka", file("kamon-akka")) @@ -53,7 +53,7 @@ object Projects extends Build { compile(akkaActor) ++ provided(aspectJ) ++ optional(logback) ++ - test(scalatest, akkaTestKit, akkaSlf4j, slf4Jul, slf4Log4j, logback)) + test(scalatest, akkaTestKit, akkaSlf4j, slf4jJul, slf4jLog4j, logback)) lazy val kamonScala = Project("kamon-scala", file("kamon-scala")) @@ -66,7 +66,7 @@ object Projects extends Build { compile() ++ provided(aspectJ) ++ optional(scalazConcurrent) ++ - test(scalatest, akkaTestKit, akkaSlf4j, slf4Jul, slf4Log4j, logback)) + test(scalatest, akkaTestKit, akkaSlf4j, slf4jJul, slf4jLog4j, logback)) lazy val kamonAkkaRemote = Project("kamon-akka-remote", file("kamon-akka-remote")) .dependsOn(kamonAkka) @@ -77,7 +77,7 @@ object Projects extends Build { libraryDependencies ++= compile(akkaRemote, akkaCluster) ++ provided(aspectJ) ++ - test(scalatest, akkaTestKit, akkaSlf4j, slf4Jul, slf4Log4j, logback)) + test(scalatest, akkaTestKit, akkaSlf4j, slf4jJul, slf4jLog4j, logback)) lazy val kamonSpray = Project("kamon-spray", file("kamon-spray")) @@ -89,7 +89,7 @@ object Projects extends Build { libraryDependencies ++= compile(akkaActor, sprayCan, sprayClient, sprayRouting) ++ provided(aspectJ) ++ - test(scalatest, akkaTestKit, sprayTestkit, akkaSlf4j, slf4Jul, slf4Log4j, logback)) + test(scalatest, akkaTestKit, sprayTestkit, akkaSlf4j, slf4jJul, slf4jLog4j, logback)) lazy val kamonNewrelic = Project("kamon-newrelic", file("kamon-newrelic")) .dependsOn(kamonCore % "compile->compile;test->test", kamonTestkit % "test->test") @@ -100,7 +100,7 @@ object Projects extends Build { libraryDependencies ++= compile(sprayCan, sprayClient, sprayRouting, sprayJson, sprayJsonLenses, newrelic, akkaSlf4j) ++ provided(aspectJ) ++ - test(scalatest, akkaTestKit, sprayTestkit, slf4Api, akkaSlf4j)) + test(scalatest, akkaTestKit, sprayTestkit, slf4jApi, akkaSlf4j)) lazy val kamonPlayground = Project("kamon-playground", file("kamon-playground")) @@ -122,7 +122,7 @@ object Projects extends Build { libraryDependencies ++= compile(akkaActor, akkaTestKit) ++ provided(aspectJ) ++ - test(slf4Api, slf4nop)) + test(slf4jApi, slf4jnop)) lazy val kamonPlay23 = Project("kamon-play-23", file("kamon-play-2.3.x")) .dependsOn(kamonCore % "compile->compile;test->test", kamonScala) @@ -133,7 +133,7 @@ object Projects extends Build { libraryDependencies ++= compile(play23, playWS23) ++ provided(aspectJ) ++ - test(playTest23, akkaTestKit, slf4Api)) + test(playTest23, akkaTestKit, slf4jApi)) lazy val kamonPlay24 = Project("kamon-play-24", file("kamon-play-2.4.x")) .dependsOn(kamonCore % "compile->compile;test->test", kamonScala) @@ -144,7 +144,7 @@ object Projects extends Build { libraryDependencies ++= compile(play24, playWS24) ++ provided(aspectJ, typesafeConfig) ++ - test(playTest24, akkaTestKit, slf4Api)) + test(playTest24, akkaTestKit, slf4jApi)) lazy val kamonStatsD = Project("kamon-statsd", file("kamon-statsd")) .dependsOn(kamonCore % "compile->compile;test->test") @@ -153,7 +153,7 @@ object Projects extends Build { .settings( libraryDependencies ++= compile(akkaActor) ++ - test(scalatest, akkaTestKit, slf4Api, slf4nop)) + test(scalatest, akkaTestKit, slf4jApi, slf4jnop)) lazy val kamonDatadog = Project("kamon-datadog", file("kamon-datadog")) .dependsOn(kamonCore % "compile->compile;test->test") @@ -162,7 +162,7 @@ object Projects extends Build { .settings( libraryDependencies ++= compile(akkaActor) ++ - test(scalatest, akkaTestKit, slf4Api, slf4nop)) + test(scalatest, akkaTestKit, slf4jApi, slf4jnop)) lazy val kamonLogReporter = Project("kamon-log-reporter", file("kamon-log-reporter")) @@ -172,7 +172,7 @@ object Projects extends Build { .settings( libraryDependencies ++= compile(akkaActor) ++ - test(scalatest, akkaTestKit, slf4Api, slf4nop)) + test(scalatest, akkaTestKit, slf4jApi, slf4jnop)) lazy val kamonSystemMetrics = Project("kamon-system-metrics", file("kamon-system-metrics")) @@ -183,7 +183,7 @@ object Projects extends Build { .settings( libraryDependencies ++= compile(sigarLoader) ++ - test(scalatest, akkaTestKit, slf4Api, slf4Jul, slf4Log4j, logback)) + test(scalatest, akkaTestKit, slf4jApi, slf4jJul, slf4jLog4j, logback)) lazy val kamonJdbc = Project("kamon-jdbc", file("kamon-jdbc")) .dependsOn(kamonCore % "compile->compile;test->test") @@ -192,7 +192,7 @@ object Projects extends Build { .settings(aspectJSettings: _*) .settings( libraryDependencies ++= - test(h2,scalatest, akkaTestKit, slf4Api) ++ + test(h2,scalatest, akkaTestKit, slf4jApi) ++ provided(aspectJ)) lazy val kamonAnnotation = Project("kamon-annotation", file("kamon-annotation")) @@ -203,7 +203,7 @@ object Projects extends Build { .settings( libraryDependencies ++= compile(el) ++ - test(scalatest, akkaTestKit, slf4Api) ++ + test(scalatest, akkaTestKit, slf4jApi) ++ provided(aspectJ)) lazy val kamonSPM = Project("kamon-spm", file("kamon-spm")) @@ -213,7 +213,7 @@ object Projects extends Build { .settings( libraryDependencies ++= compile(sprayCan, sprayClient, sprayRouting, sprayJson, sprayJsonLenses, newrelic, akkaSlf4j) ++ - test(scalatest, akkaTestKit, slf4Api, slf4nop)) + test(scalatest, akkaTestKit, slf4jApi, slf4jnop)) val noPublishing = Seq(publish := (), publishLocal := (), publishArtifact := false) } |