diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2013-10-25 23:02:56 -0300 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2013-10-25 23:02:56 -0300 |
| commit | 491277a8e30353d5e4ed7e381ab2f5aba4e6f420 (patch) | |
| tree | 6f2c718bb937fcfec9516ba434776d3ff82ce680 /project/Dependencies.scala | |
| parent | 88af5cf513e44efcf84bc7f92e02deb3c7597686 (diff) | |
| parent | 808846aaa931c2890016d7bb96ad22fd599f4104 (diff) | |
| download | Kamon-491277a8e30353d5e4ed7e381ab2f5aba4e6f420.tar.gz Kamon-491277a8e30353d5e4ed7e381ab2f5aba4e6f420.tar.bz2 Kamon-491277a8e30353d5e4ed7e381ab2f5aba4e6f420.zip | |
Merge branch 'simple-instrumentation'
Conflicts:
kamon-core/src/main/resources/application.conf
Diffstat (limited to 'project/Dependencies.scala')
| -rw-r--r-- | project/Dependencies.scala | 12 |
1 files changed, 6 insertions, 6 deletions
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") |