Permalink
Browse files

Merge branch '12-hseeberger'

  • Loading branch information...
2 parents 60560bf + 421b364 commit fe64ffd2ecbbfd488cd62ead2ff51aaacbdc31af Heiko Seeberger committed Jun 9, 2010
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/main/scala/BNDPlugin.scala
  2. +1 −1 src/main/scala/properties.scala
View
2 src/main/scala/BNDPlugin.scala
@@ -60,7 +60,7 @@ trait BNDPlugin extends DefaultProject with BNDPluginProperties {
properties.setProperty(BUNDLE_NAME, bndBundleName)
for { v <- bndBundleVendor } properties.setProperty(BUNDLE_VENDOR, v)
for { l <- bndBundleLicense } properties.setProperty(BUNDLE_LICENSE, l)
- properties.setProperty(BUNDLE_REQUIREDEXECUTIONENVIRONMENT, bndBundleRequiredExecutionEnvironment mkString ",")
+ properties.setProperty(BUNDLE_REQUIREDEXECUTIONENVIRONMENT, bndExecutionEnvironment mkString ",")
properties.setProperty(BUNDLE_CLASSPATH, bundleClasspath mkString ",")
properties.setProperty(PRIVATE_PACKAGE, bndPrivatePackage mkString ",")
properties.setProperty(EXPORT_PACKAGE, bndExportPackage mkString ",")
View
2 src/main/scala/properties.scala
@@ -55,7 +55,7 @@ private[bnd4sbt] trait BNDPluginProperties extends ProjectAccessor {
protected def bndBundleLicense: Option[String] = None
/** The value for Bundle-RequiredExecutionEnvironment. Defaults to empty set, i.e. no execution environments are defined. */
- protected def bndBundleRequiredExecutionEnvironment = Set[ExecutionEnvironments.Value]()
+ protected def bndExecutionEnvironment = Set[ExecutionEnvironments.Value]()
/** The value for Private-Package. Defaults to "*", i.e. contains everything. */
protected def bndPrivatePackage = Set("*")

0 comments on commit fe64ffd

Please sign in to comment.