Merge branch 'master' into release-legacy-akka-2.2

Conflicts:
	kamon-akka/src/test/scala/kamon/akka/RouterMetricsSpec.scala
	kamon-akka/src/test/scala/kamon/akka/instrumentation/ActorCellInstrumentationSpec.scala
	kamon-akka/src/test/scala/kamon/akka/instrumentation/AskPatternInstrumentationSpec.scala
	kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala
	kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala
	kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala
	kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala
	kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala
	kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala
	project/Dependencies.scala
	project/Settings.scala

1 files changed, 4 insertions, 7 deletions

diff --git a/project/Settings.scala b/project/Settings.scala
index 7b9743db..d65f7ce7 100644
--- a/project/Settings.scala
+++ b/project/Settings.scala
@@ -32,15 +32,12 @@ object Settings {
     scalaVersion            := ScalaVersion,
     resolvers              ++= Dependencies.resolutionRepos,
     fork in run             := true,
+    parallelExecution in Test := false,
     testGrouping in Test    := singleTestPerJvm((definedTests in Test).value, (javaOptions in Test).value),
     moduleName              := moduleName.value + "_akka-2.2",
-    javacOptions in compile := Seq(
+    javacOptions            := Seq(
       "-Xlint:-options",
-      "-source", JavaVersion, "-target", JavaVersion
-    ),
-    javacOptions in doc     := Seq(
-      "-source", JavaVersion
-    ),
+      "-source", JavaVersion, "-target", JavaVersion),
     scalacOptions           := Seq(
       "-encoding",
       "utf8",
@@ -76,4 +73,4 @@ object Settings {
       .setPreference(AlignParameters, false)
       .setPreference(AlignSingleLineCaseStatements, true)
       .setPreference(DoubleIndentClassDeclaration, true)
-}
\ No newline at end of file
+}