From 140c4dcdce46b6f6b656a667b4ca103be0c6e595 Mon Sep 17 00:00:00 2001
From: Konrad Malawski <konrad.malawski@typesafe.com>
Date: Wed, 1 Jul 2015 12:19:20 +0200
Subject: [PATCH] =pro #17855 dont publish benchmarks or tests, fix license in
 bench

---
 akka-actor-tests/build.sbt  |  2 ++
 akka-bench-jmh/build.sbt    |  7 +++++++
 akka-docs/build.sbt         |  4 ++--
 akka-remote-tests/build.sbt |  2 ++
 project/AkkaBuild.scala     | 10 ++++++++--
 project/scripts/release     |  2 +-
 6 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/akka-actor-tests/build.sbt b/akka-actor-tests/build.sbt
index 6797937285..9fe53bec61 100644
--- a/akka-actor-tests/build.sbt
+++ b/akka-actor-tests/build.sbt
@@ -7,3 +7,5 @@ Formatting.formatSettings
 publishArtifact in Compile := false
 
 Dependencies.actorTests
+
+AkkaBuild.dontPublishSettings
diff --git a/akka-bench-jmh/build.sbt b/akka-bench-jmh/build.sbt
index 7196283e2e..eb28bf33b9 100644
--- a/akka-bench-jmh/build.sbt
+++ b/akka-bench-jmh/build.sbt
@@ -1,2 +1,9 @@
+import akka._
+import com.typesafe.sbt.pgp.PgpKeys.publishSigned
+
 enablePlugins(JmhPlugin)
 disablePlugins(Unidoc)
+
+AkkaBuild.defaultSettings
+
+AkkaBuild.dontPublishSettings
diff --git a/akka-docs/build.sbt b/akka-docs/build.sbt
index 068a68f3a2..d31dde087c 100644
--- a/akka-docs/build.sbt
+++ b/akka-docs/build.sbt
@@ -21,10 +21,10 @@ SphinxDoc.docsSettings
 
 Dependencies.docs
 
-publishArtifact in Compile := false
-
 unmanagedSourceDirectories in ScalariformKeys.format in Test <<= unmanagedSourceDirectories in Test
 
 MimaKeys.reportBinaryIssues := () // disable bin comp check
 
 additionalTasks in ValidatePR += generate in Sphinx
+
+AkkaBuild.dontPublishSettings
\ No newline at end of file
diff --git a/akka-remote-tests/build.sbt b/akka-remote-tests/build.sbt
index ab5dc701ba..2d2881ff93 100644
--- a/akka-remote-tests/build.sbt
+++ b/akka-remote-tests/build.sbt
@@ -16,3 +16,5 @@ publishArtifact in Compile := false
 MimaKeys.reportBinaryIssues := () // disable bin comp check
 
 enablePlugins(MultiNodeScalaTest)
+
+AkkaBuild.dontPublishSettings
\ No newline at end of file
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index a4b4ec4b92..ac6e57a9f6 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -13,6 +13,7 @@ import akka.TestExtras.JUnitFileReporting
 import akka.TestExtras.StatsDMetrics
 import com.typesafe.sbt.S3Plugin.S3
 import com.typesafe.sbt.S3Plugin.s3Settings
+import com.typesafe.sbt.pgp.PgpKeys.publishSigned
 import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm
 import sbt.Keys._
 import sbt._
@@ -253,7 +254,12 @@ object AkkaBuild extends Build {
         }
         executeMvnCommands("Osgi sample Dining hakkers test failed", "clean", "install")
       }}
-    )
+    ) ++ dontPublishSettings
+  )
+
+  val dontPublishSettings = Seq(
+    publishSigned := (),
+    publish := ()
   )
 
   override lazy val settings =
@@ -268,7 +274,7 @@ object AkkaBuild extends Build {
 
   lazy val parentSettings = baseSettings ++ Seq(
     publishArtifact := false
-  )
+  ) ++ dontPublishSettings
 
   lazy val experimentalSettings = Seq(
     description := """|This module of Akka is marked as
diff --git a/project/scripts/release b/project/scripts/release
index 96aed40f31..622f5d3f44 100755
--- a/project/scripts/release
+++ b/project/scripts/release
@@ -194,7 +194,7 @@ function get_current_branch {
 # get the current project version from sbt
 # a little messy as the ansi escape codes are included
 function get_current_version {
-  local result=$(sbt version | tail -1 | cut -f2)
+  local result=$(sbt version | grep -v warn | tail -1 | cut -f2)
   # remove ansi escape code from end
   local code0=$(echo -e "\033[0m")
   echo ${result%$code0}