luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hk2-jar packaging should be handled like a standard jar. fixes #463

This commit is contained in:
Mark Harrah 2012-05-16 07:34:15 -04:00
parent 50ddd485af
commit 53ee1c5adf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/CustomPomParser.scala
View File

@ -35,7 +35,7 @@ object CustomPomParser
val ExtraAttributesKey = "extraDependencyAttributes" val ExtraAttributesKey = "extraDependencyAttributes"
// packagings that should be jars, but that Ivy doesn't handle as jars // packagings that should be jars, but that Ivy doesn't handle as jars
val JarPackagings = Set("eclipse-plugin") val JarPackagings = Set("eclipse-plugin", "hk2-jar")
val default = new CustomPomParser(PomModuleDescriptorParser.getInstance, defaultTransform) val default = new CustomPomParser(PomModuleDescriptorParser.getInstance, defaultTransform)
// Unfortunately, ModuleDescriptorParserRegistry is add-only and is a singleton instance. // Unfortunately, ModuleDescriptorParserRegistry is add-only and is a singleton instance.

2
main/Defaults.scala
View File

@ -99,7 +99,7 @@ object Defaults extends BuildCommon
javaOptions :== Nil, javaOptions :== Nil,
sbtPlugin :== false, sbtPlugin :== false,
crossPaths :== true, crossPaths :== true,
classpathTypes :== Set("jar", "bundle"), classpathTypes :== Set("jar", "bundle", "hk2-jar"),
aggregate :== true, aggregate :== true,
maxErrors :== 100, maxErrors :== 100,
showTiming :== true, showTiming :== true,