From 5a93605d7596f78734691aff2a31deab22d37e87 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 6 Jul 2012 10:28:51 -0400 Subject: [PATCH] 'orbit' packaging should be handled like a standard jar. fixes #499. ref #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 98e22b462..aced1d48a 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", "hk2-jar") + val JarPackagings = Set("eclipse-plugin", "hk2-jar", "orbit") 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 6e4b477b2..9e81496f8 100755 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -100,7 +100,7 @@ object Defaults extends BuildCommon javaOptions :== Nil, sbtPlugin :== false, crossPaths :== true, - classpathTypes :== Set("jar", "bundle", "hk2-jar"), + classpathTypes :== Set("jar", "bundle", "hk2-jar", "orbit"), aggregate :== true, maxErrors :== 100, showTiming :== true,