From 53ee1c5adf2a370a8a11657781ed432e5dd76aba Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 16 May 2012 07:34:15 -0400 Subject: [PATCH] hk2-jar packaging should be handled like a standard jar. fixes #463 --- ivy/CustomPomParser.scala | 2 +- main/Defaults.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ivy/CustomPomParser.scala b/ivy/CustomPomParser.scala index 9135cab41..98e22b462 100644 --- a/ivy/CustomPomParser.scala +++ b/ivy/CustomPomParser.scala @@ -35,7 +35,7 @@ object CustomPomParser val ExtraAttributesKey = "extraDependencyAttributes" // 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) // Unfortunately, ModuleDescriptorParserRegistry is add-only and is a singleton instance. diff --git a/main/Defaults.scala b/main/Defaults.scala index 9ad85d819..48267ff9f 100755 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -99,7 +99,7 @@ object Defaults extends BuildCommon javaOptions :== Nil, sbtPlugin :== false, crossPaths :== true, - classpathTypes :== Set("jar", "bundle"), + classpathTypes :== Set("jar", "bundle", "hk2-jar"), aggregate :== true, maxErrors :== 100, showTiming :== true,