From 818f77fc42101a0fa975c4f6d66b436abbce3b33 Mon Sep 17 00:00:00 2001 From: Miguel Molina Date: Mon, 4 Sep 2017 11:49:14 +0200 Subject: [PATCH] enry-java: publish fat jar without any classifiers in assembly task Signed-off-by: Miguel Molina --- java/build.sbt | 5 +++-- java/sbt | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/java/build.sbt b/java/build.sbt index d848a2e..b281d73 100644 --- a/java/build.sbt +++ b/java/build.sbt @@ -15,10 +15,11 @@ unmanagedClasspath in Runtime += baseDirectory.value / "shared" unmanagedClasspath in Compile += baseDirectory.value / "shared" testOptions += Tests.Argument(TestFrameworks.JUnit) +publishArtifact in (Compile, packageBin) := false artifact in (Compile, assembly) := { val art = (artifact in (Compile, assembly)).value - art.copy(`classifier` = Some("assembly")) + art.copy(`classifier` = None) } -addArtifact(artifact in (Compile, assembly), assembly) \ No newline at end of file +addArtifact(artifact in (Compile, assembly), assembly) diff --git a/java/sbt b/java/sbt index bd59c22..3afcc3e 100755 --- a/java/sbt +++ b/java/sbt @@ -9,7 +9,7 @@ # Redistribution and use in source and binary forms, with or withou # modification, are permitted provided that the following conditions are # met: -# +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright @@ -18,7 +18,7 @@ # * Neither the name of the author nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR