Browse files

Merge branch '12-hseeberger'

  • Loading branch information...
2 parents eb75b13 + 19a649e commit 60560bf0d72f16c454bbcb45d17e6f5a1b9b8702 Heiko Seeberger committed Jun 2, 2010
Showing with 3 additions and 3 deletions.
  1. +2 −2 src/main/scala/properties.scala
  2. +1 −1 test/project/plugins/project/build.properties
View
4 src/main/scala/properties.scala
@@ -84,8 +84,8 @@ private[bnd4sbt] trait BNDPluginProperties extends ProjectAccessor {
/** Should the nouses directive be applied? Defaults to false. */
protected def bndNoUses = false
- /** The fileName as part of BNDPlugin.bndOutput. Defaults to projectName_buildScalaVersion-projectVersion.jar. */
- protected def bndFileName = "%s_%s-%s.jar".format(project.name, project.buildScalaVersion, project.version)
+ /** The fileName as part of BNDPlugin.bndOutput. Defaults to this project's defaultJarName. */
+ protected def bndFileName = project.defaultJarName
/** The output path used by BND. Defaults to the outputPath of this project plus the value of BNDPlugin.bndFileName. */
protected def bndOutput = project.outputPath / bndFileName
View
2 test/project/plugins/project/build.properties
@@ -1,3 +1,3 @@
#Project properties
-#Wed Jun 02 18:17:17 CEST 2010
+#Wed Jun 02 20:57:42 CEST 2010
plugin.uptodate=true

0 comments on commit 60560bf

Please sign in to comment.