Repository: incubator-gearpump Updated Branches: refs/heads/master 5cd5b9304 -> 71a4e9b8e
fix GEARPUMP-212 Make Gearpump's shaded artifacts publishable Author: huafengw <fvunic...@gmail.com> Closes #87 from huafengw/fix212. Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/71a4e9b8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/71a4e9b8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/71a4e9b8 Branch: refs/heads/master Commit: 71a4e9b8e1fb7907505eb82bf13992ea7e8ccdc5 Parents: 5cd5b93 Author: huafengw <fvunic...@gmail.com> Authored: Fri Sep 23 14:23:06 2016 +0800 Committer: manuzhang <owenzhang1...@gmail.com> Committed: Fri Sep 23 14:23:06 2016 +0800 ---------------------------------------------------------------------- project/BuildShaded.scala | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/71a4e9b8/project/BuildShaded.scala ---------------------------------------------------------------------- diff --git a/project/BuildShaded.scala b/project/BuildShaded.scala index 8088206..1f59bfd 100644 --- a/project/BuildShaded.scala +++ b/project/BuildShaded.scala @@ -28,7 +28,7 @@ object BuildShaded extends sbt.Build { val gsCollectionsVersion = "6.2.0" private val scalaVersionMajor = "2.11" - val shadeAssemblySettings = Seq( + val shadeAssemblySettings = Build.commonSettings ++ Seq( scalaVersion := Build.scalaVersionNumber, test in assembly := {}, assemblyOption in assembly ~= { @@ -50,7 +50,8 @@ object BuildShaded extends sbt.Build { lazy val shaded_akka_kryo = Project( id = "gearpump-shaded-akka-kryo", base = file("shaded/akka-kryo"), - settings = shadeAssemblySettings ++ + settings = shadeAssemblySettings ++ addArtifact(Artifact("gearpump-shaded-akka-kryo", + "assembly"), sbtassembly.AssemblyKeys.assembly) ++ Seq( assemblyShadeRules in assembly := Seq( ShadeRule.zap("com.google.protobuf.**").inAll, @@ -75,7 +76,8 @@ object BuildShaded extends sbt.Build { lazy val shaded_gs_collections = Project( id = "gearpump-shaded-gs-collections", base = file("shaded/gs-collections"), - settings = shadeAssemblySettings ++ + settings = shadeAssemblySettings ++ addArtifact(Artifact("gearpump-shaded-gs-collections", + "assembly"), sbtassembly.AssemblyKeys.assembly) ++ Seq( assemblyShadeRules in assembly := Seq( ShadeRule.rename("com.gs.collections.**" -> @@ -92,7 +94,8 @@ object BuildShaded extends sbt.Build { lazy val shaded_guava = Project( id = "gearpump-shaded-guava", base = file("shaded/guava"), - settings = shadeAssemblySettings ++ + settings = shadeAssemblySettings ++ addArtifact(Artifact("gearpump-shaded-guava", + "assembly"), sbtassembly.AssemblyKeys.assembly) ++ Seq( assemblyShadeRules in assembly := Seq( ShadeRule.rename("com.google.**" -> "org.apache.gearpump.google.@1").inAll @@ -108,7 +111,8 @@ object BuildShaded extends sbt.Build { lazy val shaded_metrics_graphite = Project( id = "gearpump-shaded-metrics-graphite", base = file("shaded/metrics-graphite"), - settings = shadeAssemblySettings ++ + settings = shadeAssemblySettings ++ addArtifact(Artifact("gearpump-shaded-metrics-graphite", + "assembly"), sbtassembly.AssemblyKeys.assembly) ++ Seq( assemblyShadeRules in assembly := Seq( ShadeRule.rename("com.codahale.metrics.**" ->
