Merge pull request #98 from erizocosmico/fix/fat-jar

enry-java: publish fat jar without any classifiers in assembly task
This commit is contained in:
Alfredo Beaumont 2017-09-07 12:26:04 +02:00 committed by GitHub
commit e1b2326b22
2 changed files with 5 additions and 4 deletions

View File

@ -15,10 +15,11 @@ unmanagedClasspath in Runtime += baseDirectory.value / "shared"
unmanagedClasspath in Compile += baseDirectory.value / "shared" unmanagedClasspath in Compile += baseDirectory.value / "shared"
testOptions += Tests.Argument(TestFrameworks.JUnit) testOptions += Tests.Argument(TestFrameworks.JUnit)
publishArtifact in (Compile, packageBin) := false
artifact in (Compile, assembly) := { artifact in (Compile, assembly) := {
val art = (artifact in (Compile, assembly)).value 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)

View File

@ -9,7 +9,7 @@
# Redistribution and use in source and binary forms, with or withou # Redistribution and use in source and binary forms, with or withou
# modification, are permitted provided that the following conditions are # modification, are permitted provided that the following conditions are
# met: # met:
# #
# * Redistributions of source code must retain the above copyright # * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer. # notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright # * 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 # * Neither the name of the author nor the names of its contributors
# may be used to endorse or promote products derived from this software # may be used to endorse or promote products derived from this software
# without specific prior written permission. # without specific prior written permission.
# #
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR