Merge branch 'simple-instrumentation'

Conflicts:
	kamon-core/src/main/resources/application.conf

6 files changed, 24 insertions, 19 deletions

diff --git a/project/AspectJ.scala b/project/AspectJ.scala
index fb5d8bf9..b6c5037a 100644
--- a/project/AspectJ.scala
+++ b/project/AspectJ.scala
@@ -10,6 +10,9 @@ object AspectJ {
      compileOnly in Aspectj    :=  true,
                fork in Test    :=  true,
         javaOptions in Test  <++=  weaverOptions in Aspectj,
+                fork in run    :=  true,
+         javaOptions in run  <++=  weaverOptions in Aspectj,
+
   lintProperties in Aspectj    +=  "invalidAbsoluteTypeName = ignore"
 
     //  Add this line if we need to include some .aj aspects again in the project.
diff --git a/project/Build.scala b/project/Build.scala
index 0141540b..23880c33 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -8,26 +8,26 @@ object Build extends Build {
   import Dependencies._
 
   lazy val root = Project("root", file("."))
-    .aggregate(kamonCore, kamonUow, kamonDashboard)
+    .aggregate(kamonCore, kamonDashboard)
     .settings(basicSettings: _*)
+    .settings(
+      publish := (),
+      publishLocal := ()
+    )
 
   lazy val kamonCore = Project("kamon-core", file("kamon-core"))
     .settings(basicSettings: _*)
     .settings(revolverSettings: _*)
     .settings(aspectJSettings: _*)
-    .settings(newrelicSettings: _*)
+    //.settings(newrelicSettings: _*)
 
     .settings(
       libraryDependencies ++=
-        compile(akkaActor, akkaAgent, sprayCan, sprayClient, sprayRouting, sprayServlet, aspectJ, aspectJWeaver, metrics, sprayJson) ++
-        test(scalatest, akkaTestKit, sprayTestkit))
+        compile(akkaActor, akkaAgent, aspectJ, aspectJWeaver, metrics, newrelic, sprayJson) ++
+        compile(sprayCan, sprayClient, sprayRouting, logback, akkaSlf4j) ++
+        test(scalatest, akkaTestKit, sprayTestkit, logback, akkaSlf4j))
     //.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 b61f0979..90336c02 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -7,26 +7,26 @@ object Dependencies {
     "spray nightlies repo"  at "http://nightlies.spray.io"
   )
 
-  val sprayVersion = "1.2-20130801"
-  val akkaVersion  = "2.2.0"
+  val sprayVersion = "1.2-RC1"
+  val akkaVersion  = "2.2.3"
 
   val sprayCan        = "io.spray"                  %   "spray-can"             % sprayVersion
   val sprayRouting    = "io.spray"                  %   "spray-routing"         % sprayVersion
   val sprayTestkit    = "io.spray"                  %   "spray-testkit"         % sprayVersion
   val sprayClient     = "io.spray"                  %   "spray-client"          % sprayVersion
-  val sprayServlet    = "io.spray"                  %   "spray-servlet"         % sprayVersion
-  val sprayJson       = "io.spray"                  %%  "spray-json"            % "1.2.3"
+  val sprayJson       = "io.spray"                  %%  "spray-json"            % "1.2.5"
   val scalaReflect    = "org.scala-lang"            %   "scala-reflect"         % "2.10.1"
   val akkaActor       = "com.typesafe.akka"         %%  "akka-actor"            % akkaVersion
   val akkaAgent       = "com.typesafe.akka"         %%  "akka-agent"            % akkaVersion
   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"
+  val newrelic        = "com.newrelic.agent.java"   %   "newrelic-api"          % "3.0.1"
+
 
   def compile   (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "compile")
   def provided  (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "provided")
diff --git a/project/NewRelic.scala b/project/NewRelic.scala
index 74f8fc30..2fc590cd 100644
--- a/project/NewRelic.scala
+++ b/project/NewRelic.scala
@@ -8,6 +8,6 @@ object NewRelic {
 
   lazy val newrelicSettings =  SbtNewrelic.newrelicSettings ++ Seq(
              javaOptions in run   <++=  jvmOptions in newrelic,
-    newrelicVersion in newrelic     :=  "2.19.0"
+    newrelicVersion in newrelic     :=  "3.0.1"
   )
 }
diff --git a/project/Settings.scala b/project/Settings.scala
index df120b0a..f7f07527 100644
--- a/project/Settings.scala
+++ b/project/Settings.scala
@@ -3,12 +3,12 @@ import Keys._
 import spray.revolver.RevolverPlugin.Revolver
 
 object Settings {
-  val VERSION = "0.1-SNAPSHOT"
+  val VERSION = "0.0.6"
 
   lazy val basicSettings = seq(
     version       := VERSION,
     organization  := "kamon",
-    scalaVersion  := "2.10.2",
+    scalaVersion  := "2.10.3",
     resolvers    ++= Dependencies.resolutionRepos,
     fork in run   := true,
     scalacOptions := Seq(
@@ -23,7 +23,7 @@ object Settings {
       "-language:implicitConversions",
       "-Xlog-reflective-calls"
     ),
-    publishTo     := Some("Nexus" at "http://nexus.despegar.it:8080/nexus/content/repositories/snapshots")
+    publishTo     := Some("Nexus" at "http://nexus.despegar.it:8080/nexus/content/repositories/releases")
   )
 
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 6dc4b037..70e313e9 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -7,3 +7,5 @@ addSbtPlugin("io.spray" % "sbt-revolver" % "0.6.2")
 addSbtPlugin("com.typesafe.sbt" % "sbt-aspectj" % "0.9.0")
 
 addSbtPlugin("com.ivantopo.sbt" % "sbt-newrelic" % "0.0.1")
+
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8")