diff options
| author | Diego <diegolparra@gmail.com> | 2014-12-04 02:40:13 -0300 |
|---|---|---|
| committer | Diego <diegolparra@gmail.com> | 2014-12-04 02:40:13 -0300 |
| commit | 3905757c2eb9658d136c50de82180a74b002df7e (patch) | |
| tree | 02717bfbae071b8c506e3014991f4ccd2fd59b32 /project | |
| parent | 5413b1144610c932b728af79f9224df48c1c5447 (diff) | |
| download | Kamon-3905757c2eb9658d136c50de82180a74b002df7e.tar.gz Kamon-3905757c2eb9658d136c50de82180a74b002df7e.tar.bz2 Kamon-3905757c2eb9658d136c50de82180a74b002df7e.zip | |
+ kamon-jdbc: introduce kamon-jdbc module
Diffstat (limited to 'project')
| -rw-r--r-- | project/Dependencies.scala | 5 | ||||
| -rw-r--r-- | project/Projects.scala | 21 |
2 files changed, 12 insertions, 14 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8ff42314..c66d77a1 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -51,10 +51,9 @@ object Dependencies { val slf4Api = "org.slf4j" % "slf4j-api" % slf4jVersion val slf4nop = "org.slf4j" % "slf4j-nop" % slf4jVersion val scalaCompiler = "org.scala-lang" % "scala-compiler" % Settings.ScalaVersion - val sigar = "org.fusesource" % "sigar" % "1.6.4" // TODO remove val scalazConcurrent = "org.scalaz" %% "scalaz-concurrent" % "7.1.0" - val sigarLoader = "io.kamon" - val h2 = "com.h2database" % "sigar-loader" % "1.6.5-rev001" + val sigarLoader = "io.kamon" % "sigar-loader" % "1.6.5-rev001" + val h2 = "com.h2database" % "h2" % "1.4.182" def compile (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "compile") def provided (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "provided") diff --git a/project/Projects.scala b/project/Projects.scala index 28f52e7e..aa583e2e 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -23,7 +23,7 @@ object Projects extends Build { lazy val root = Project("root", file(".")) .aggregate(kamonCore, kamonSpray, kamonNewrelic, kamonPlayground, kamonDashboard, kamonTestkit, kamonPlay, kamonStatsD, - kamonDatadog, kamonSystemMetrics, kamonLogReporter, kamonAkkaRemote) + kamonDatadog, kamonSystemMetrics, kamonLogReporter, kamonAkkaRemote, kamonJdbc) .settings(basicSettings: _*) .settings(formatSettings: _*) .settings(noPublishing: _*) @@ -172,16 +172,15 @@ object Projects extends Build { test(scalatest, akkaTestKit, slf4Api, slf4nop)) .dependsOn(kamonCore) -lazy val kamonJdbc = Project("kamon-jdbc", file("kamon-jdbc")) - .settings(basicSettings: _*) - .settings(formatSettings: _*) - .settings(aspectJSettings: _*) - .settings( - libraryDependencies ++= - test(h2,scalatest, akkaTestKit, slf4Api) ++ - provided(aspectJ)) - .dependsOn(kamonCore) - + lazy val kamonJdbc = Project("kamon-jdbc", file("kamon-jdbc")) + .settings(basicSettings: _*) + .settings(formatSettings: _*) + .settings(aspectJSettings: _*) + .settings( + libraryDependencies ++= + test(h2,scalatest, akkaTestKit, slf4Api) ++ + provided(aspectJ)) + .dependsOn(kamonCore) val noPublishing = Seq(publish := (), publishLocal := (), publishArtifact := false) } |