Skip to content

Commit

Permalink
Merge pull request #98 from erizocosmico/fix/fat-jar
Browse files Browse the repository at this point in the history
enry-java: publish fat jar without any classifiers in assembly task
  • Loading branch information
abeaumont authored Sep 7, 2017
2 parents 0fe0a97 + 818f77f commit e1b2326
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions java/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
addArtifact(artifact in (Compile, assembly), assembly)
4 changes: 2 additions & 2 deletions java/sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit e1b2326

Please sign in to comment.