From 12419a7dd5ad80c04de5695b61598a145ebcb274 Mon Sep 17 00:00:00 2001
From: Konrad Malawski <konrad.malawski@typesafe.com>
Date: Thu, 21 May 2015 15:33:37 +0200
Subject: [PATCH] =pro update sbt-jmh and include for compilation in root

---
 akka-bench-jmh/build.sbt | 8 +-------
 project/AkkaBuild.scala  | 4 ++--
 project/plugins.sbt      | 2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/akka-bench-jmh/build.sbt b/akka-bench-jmh/build.sbt
index 87c27a5cd8..bb17cb12ca 100644
--- a/akka-bench-jmh/build.sbt
+++ b/akka-bench-jmh/build.sbt
@@ -1,7 +1 @@
-import akka.{ AkkaBuild, Dependencies, Formatting, Unidoc }
-
-import pl.project13.scala.sbt.SbtJmh._
-import pl.project13.scala.sbt.SbtJmh.JmhKeys._
-
-jmhSettings
-
+enablePlugins(JmhPlugin)
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 2cdda33000..dc9e535c1d 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -56,7 +56,7 @@ object AkkaBuild extends Build {
       }
     ),
     aggregate = Seq(actor, testkit, actorTests, remote, remoteTests, camel, cluster, clusterMetrics, clusterTools, clusterSharding,
-      slf4j, agent, persistence, persistenceTck, kernel, osgi, docs, contrib, samples, multiNodeTestkit, typed)
+      slf4j, agent, persistence, persistenceTck, kernel, osgi, docs, contrib, samples, multiNodeTestkit, benchJmh, typed)
   )
 
   lazy val akkaScalaNightly = Project(
@@ -65,7 +65,7 @@ object AkkaBuild extends Build {
     // remove dependencies that we have to build ourselves (Scala STM)
     // samples don't work with dbuild right now
     aggregate = Seq(actor, testkit, actorTests, remote, remoteTests, camel, cluster, clusterMetrics, clusterTools, clusterSharding,
-      slf4j, persistence, persistenceTck, kernel, osgi, contrib, multiNodeTestkit, typed)
+      slf4j, persistence, persistenceTck, kernel, osgi, contrib, multiNodeTestkit, benchJmh, typed)
   ).disablePlugins(ValidatePullRequest)
 
   lazy val actor = Project(
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 646116e9ed..461c0b5c22 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -27,7 +27,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.3")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.6.2")
 
-addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.1.6")
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.0")
 
 // stats reporting
 libraryDependencies += "com.timgroup" % "java-statsd-client" % "2.0.0"