summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-05-11 09:35:40 +1000
committerJason Zaugg <jzaugg@gmail.com>2016-05-11 09:35:40 +1000
commit1125d054020f20e694314ebd4983f7f5ac44ae9d (patch)
tree2a9e25ceeab76ced9d1d3dd57bce0a8e35e21a39 /project
parent38590c83c953706ef51f1c01fc0bc86f9b93daab (diff)
parentd06ce96a515ce3e4cdb724d30993ae45787716c6 (diff)
downloadscala-1125d054020f20e694314ebd4983f7f5ac44ae9d.tar.gz
scala-1125d054020f20e694314ebd4983f7f5ac44ae9d.tar.bz2
scala-1125d054020f20e694314ebd4983f7f5ac44ae9d.zip
Merge commit 'd06ce96' into merge/2.11.x-to-2.12.x-20160511
Diffstat (limited to 'project')
-rw-r--r--project/Osgi.scala1
1 files changed, 0 insertions, 1 deletions
diff --git a/project/Osgi.scala b/project/Osgi.scala
index d88c282383..36803c0e44 100644
--- a/project/Osgi.scala
+++ b/project/Osgi.scala
@@ -40,7 +40,6 @@ object Osgi {
},
packagedArtifact in (Compile, packageBin) <<= (artifact in (Compile, packageBin), bundle).identityMap,
// Also create OSGi source bundles:
- artifact in (Compile, packageBin) ~= (_.copy(`type` = "bundle")),
packageOptions in (Compile, packageSrc) += Package.ManifestAttributes(
"Bundle-Name" -> (description.value + " Sources"),
"Bundle-SymbolicName" -> (bundleSymbolicName.value + ".source"),