diff options
| author | Diego <diegolparra@gmail.com> | 2015-02-07 14:26:26 -0300 |
|---|---|---|
| committer | Diego <diegolparra@gmail.com> | 2015-03-01 18:44:04 -0300 |
| commit | 2cc7eeee6fe31a4dfd479f3c0abf1085c7bbf879 (patch) | |
| tree | ba75d454858f4d020e79b084c5166e300962a437 /project | |
| parent | 0f2f2be4e4fc44a512ed79ab09f0d83d3fd0e871 (diff) | |
| download | Kamon-2cc7eeee6fe31a4dfd479f3c0abf1085c7bbf879.tar.gz Kamon-2cc7eeee6fe31a4dfd479f3c0abf1085c7bbf879.tar.bz2 Kamon-2cc7eeee6fe31a4dfd479f3c0abf1085c7bbf879.zip | |
! kamon-annotation: defined instruments @Trace @Segment @Gauge @Timed @Counted @Histogram and full implemetation
Diffstat (limited to 'project')
| -rw-r--r-- | project/Dependencies.scala | 1 | ||||
| -rw-r--r-- | project/Projects.scala | 15 | ||||
| -rw-r--r-- | project/Settings.scala | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b9bd89e7..55f4e2a4 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -56,6 +56,7 @@ object Dependencies { val scalazConcurrent = "org.scalaz" %% "scalaz-concurrent" % "7.1.0" val sigarLoader = "io.kamon" % "sigar-loader" % "1.6.5-rev001" val h2 = "com.h2database" % "h2" % "1.4.182" + val el = "org.glassfish" % "javax.el" % "3.0.0" 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 d52a7764..2869f73b 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -23,7 +23,7 @@ object Projects extends Build { lazy val kamon = Project("kamon", file(".")) .aggregate(kamonCore, kamonSpray, kamonNewrelic, kamonPlayground, kamonDashboard, kamonTestkit, kamonPlay, kamonStatsD, - kamonDatadog, kamonSystemMetrics, kamonLogReporter, kamonAkkaRemote, kamonJdbc) + kamonDatadog, kamonSystemMetrics, kamonLogReporter, kamonAkkaRemote, kamonJdbc, kamonAnnotation) .settings(basicSettings: _*) .settings(formatSettings: _*) .settings(noPublishing: _*) @@ -193,5 +193,16 @@ object Projects extends Build { test(h2,scalatest, akkaTestKit, slf4Api) ++ provided(aspectJ)) + lazy val kamonAnnotation = Project("kamon-annotation", file("kamon-annotation")) + .dependsOn(kamonCore % "compile->compile;test->test") + .settings(basicSettings: _*) + .settings(formatSettings: _*) + .settings(aspectJSettings: _*) + .settings( + libraryDependencies ++= + compile(el) ++ + test(scalatest, akkaTestKit, slf4Api) ++ + provided(aspectJ)) + val noPublishing = Seq(publish := (), publishLocal := (), publishArtifact := false) -} +}
\ No newline at end of file diff --git a/project/Settings.scala b/project/Settings.scala index 3758fb15..8f839914 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -27,7 +27,7 @@ object Settings { val JavaVersion = "1.6" val ScalaVersion = "2.11.5" - + lazy val basicSettings = Seq( scalaVersion := ScalaVersion, resolvers ++= Dependencies.resolutionRepos, @@ -75,4 +75,4 @@ object Settings { .setPreference(AlignParameters, false) .setPreference(AlignSingleLineCaseStatements, true) .setPreference(DoubleIndentClassDeclaration, true) -}
\ No newline at end of file +} |