diff options
| author | Diego <diegolparra@gmail.com> | 2014-08-09 16:01:22 -0300 |
|---|---|---|
| committer | Diego <diegolparra@gmail.com> | 2014-08-09 16:01:22 -0300 |
| commit | 0493752254dcace311f12574f4053b184f6b164f (patch) | |
| tree | 50084ce423a5f39d87b1d86ce10816d51824f3cd /project | |
| parent | b2dfa163ff87a923c3ed99cd9a569631084ce5e9 (diff) | |
| download | Kamon-0493752254dcace311f12574f4053b184f6b164f.tar.gz Kamon-0493752254dcace311f12574f4053b184f6b164f.tar.bz2 Kamon-0493752254dcace311f12574f4053b184f6b164f.zip | |
+ core: inline jsr166 to remove dependency
Diffstat (limited to 'project')
| -rw-r--r-- | project/Dependencies.scala | 1 | ||||
| -rw-r--r-- | project/Projects.scala | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 1b67d214..6d07d6d8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -34,7 +34,6 @@ object Dependencies { val playTest = "org.scalatestplus" %% "play" % "1.1.0" val slf4Api = "org.slf4j" % "slf4j-api" % slf4jVersion val slf4nop = "org.slf4j" % "slf4j-nop" % slf4jVersion - val jsr166 = "io.gatling" % "jsr166e" % "1.0" val scalaCompiler = "org.scala-lang" % "scala-compiler" % Settings.ScalaVersion val sigar = "org.fusesource" % "sigar" % "1.6.4" diff --git a/project/Projects.scala b/project/Projects.scala index c53d34ae..cbdd7d3d 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -23,7 +23,7 @@ object Projects extends Build { mappings in (Compile, packageBin) ++= mappings.in(kamonMacros, Compile, packageBin).value, mappings in (Compile, packageSrc) ++= mappings.in(kamonMacros, Compile, packageSrc).value, libraryDependencies ++= - compile(akkaActor, aspectJ, hdrHistogram, jsr166) ++ + compile(akkaActor, aspectJ, hdrHistogram) ++ provided(logback, aspectjWeaver) ++ test(scalatest, akkaTestKit, sprayTestkit, akkaSlf4j, logback)) |