aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorDiego <diegolparra@gmail.com>2014-03-15 11:21:44 -0300
committerDiego <diegolparra@gmail.com>2014-03-15 11:25:02 -0300
commitcc079f18a2c00678397fae0714eb524dfe8961f2 (patch)
tree24dd0dcc0c63b6aa4aa01b19c7dee524f25de0d4 /project
parent75a0a4303c313266d34efd5711fe62ed70ce79b3 (diff)
downloadKamon-cc079f18a2c00678397fae0714eb524dfe8961f2.tar.gz
Kamon-cc079f18a2c00678397fae0714eb524dfe8961f2.tar.bz2
Kamon-cc079f18a2c00678397fae0714eb524dfe8961f2.zip
implementation of IMessageHandler interface in order to control Aspectj weaving messages through kamon
Diffstat (limited to 'project')
-rw-r--r--project/Build.scala10
-rw-r--r--project/Dependencies.scala15
-rw-r--r--project/plugins.sbt2
3 files changed, 17 insertions, 10 deletions
diff --git a/project/Build.scala b/project/Build.scala
index 1b9c01ca..4c29391f 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -21,7 +21,7 @@ object Build extends Build {
.settings(aspectJSettings: _*)
.settings(
libraryDependencies ++=
- compile(akkaActor, aspectJ, hdrHistogram) ++
+ compile(akkaActor, aspectJ, aspectjWeaver, hdrHistogram) ++
provided(logback) ++
test(scalatest, akkaTestKit, sprayTestkit, akkaSlf4j, logback))
@@ -33,7 +33,7 @@ object Build extends Build {
.settings(
libraryDependencies ++=
compile(akkaActor, aspectJ, sprayCan, sprayClient, sprayRouting) ++
- test(scalatest, akkaTestKit, sprayTestkit))
+ test(scalatest, akkaTestKit, sprayTestkit, slf4Api, slf4nop))
.dependsOn(kamonCore, kamonTestkit)
@@ -44,7 +44,7 @@ object Build extends Build {
.settings(
libraryDependencies ++=
compile(aspectJ, sprayCan, sprayClient, sprayRouting, sprayJson, sprayJsonLenses, newrelic, snakeYaml) ++
- test(scalatest, akkaTestKit, sprayTestkit))
+ test(scalatest, akkaTestKit, sprayTestkit, slf4Api, slf4nop))
.dependsOn(kamonCore)
@@ -69,7 +69,7 @@ object Build extends Build {
lazy val kamonTestkit = Project("kamon-testkit", file("kamon-testkit"))
.settings(basicSettings: _*)
.settings(formatSettings: _*)
- .settings(libraryDependencies ++= compile(akkaActor, akkaTestKit))
+ .settings(libraryDependencies ++= compile(akkaActor, akkaTestKit) ++ test(slf4Api, slf4nop))
.dependsOn(kamonCore)
@@ -77,7 +77,7 @@ object Build extends Build {
.settings(basicSettings: _*)
.settings(formatSettings: _*)
.settings(aspectJSettings: _*)
- .settings(libraryDependencies ++= compile(playTest, aspectJ) ++ test(playTest))
+ .settings(libraryDependencies ++= compile(playTest, aspectJ) ++ test(playTest, slf4Api))
.dependsOn(kamonCore)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 5e59aa4d..82375632 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -8,14 +8,18 @@ object Dependencies {
"typesafe repo" at "http://repo.typesafe.com/typesafe/releases/"
)
- val sprayVersion = "1.2.0"
- val akkaVersion = "2.2.3"
+ val sprayVersion = "1.2.0"
+ val akkaVersion = "2.2.3"
+ val playVersion = "2.2.2"
+ val aspectjVersion = "1.7.4"
+ val slf4jVersion = "1.7.6"
val sprayJson = "io.spray" %% "spray-json" % "1.2.5"
val sprayJsonLenses = "net.virtual-void" %% "json-lenses" % "0.5.3"
val scalatest = "org.scalatest" % "scalatest_2.10" % "2.0"
val logback = "ch.qos.logback" % "logback-classic" % "1.0.13"
- val aspectJ = "org.aspectj" % "aspectjrt" % "1.7.2"
+ val aspectJ = "org.aspectj" % "aspectjrt" % aspectjVersion
+ val aspectjWeaver = "org.aspectj" % "aspectjweaver" % aspectjVersion
val newrelic = "com.newrelic.agent.java" % "newrelic-api" % "3.1.0"
val snakeYaml = "org.yaml" % "snakeyaml" % "1.13"
val hdrHistogram = "org.hdrhistogram" % "HdrHistogram" % "1.0.8"
@@ -26,7 +30,10 @@ object Dependencies {
val akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion
val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % akkaVersion
val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % akkaVersion
- val playTest = "com.typesafe.play" %% "play-test" % "2.2.1"
+ val playTest = "com.typesafe.play" %% "play-test" % playVersion
+ val slf4Api = "org.slf4j" % "slf4j-api" % slf4jVersion
+ val slf4nop = "org.slf4j" % "slf4j-nop" % slf4jVersion
+
def compile (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "compile")
diff --git a/project/plugins.sbt b/project/plugins.sbt
index ee0b967c..33519318 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -6,7 +6,7 @@ addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.6.2")
-addSbtPlugin("com.typesafe.sbt" % "sbt-aspectj" % "0.9.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-aspectj" % "0.9.4")
addSbtPlugin("com.ivantopo.sbt" % "sbt-newrelic" % "0.0.1")