From 51f48a8993456dc4cb52a638af689200157ed303 Mon Sep 17 00:00:00 2001
From: Tejas Mandke <tejas.mandke@workday.com>
Date: Wed, 24 Sep 2014 19:33:18 -0700
Subject: [PATCH] propagate pattern descriptorOptional and skipConsistencyCheck

---
 ivy/src/main/scala/sbt/Resolver.scala |  2 +-
 ivy/src/test/scala/ResolverTest.scala | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 ivy/src/test/scala/ResolverTest.scala

diff --git a/ivy/src/main/scala/sbt/Resolver.scala b/ivy/src/main/scala/sbt/Resolver.scala
index b0a45f949..01db05ea1 100644
--- a/ivy/src/main/scala/sbt/Resolver.scala
+++ b/ivy/src/main/scala/sbt/Resolver.scala
@@ -285,7 +285,7 @@ object Resolver {
   private def resolvePatterns(base: String, basePatterns: Patterns): Patterns =
     {
       def resolveAll(patterns: Seq[String]) = patterns.map(p => resolvePattern(base, p))
-      Patterns(resolveAll(basePatterns.ivyPatterns), resolveAll(basePatterns.artifactPatterns), basePatterns.isMavenCompatible)
+      Patterns(resolveAll(basePatterns.ivyPatterns), resolveAll(basePatterns.artifactPatterns), basePatterns.isMavenCompatible, basePatterns.descriptorOptional, basePatterns.skipConsistencyCheck)
     }
   private[sbt] def resolvePattern(base: String, pattern: String): String =
     {
diff --git a/ivy/src/test/scala/ResolverTest.scala b/ivy/src/test/scala/ResolverTest.scala
new file mode 100644
index 000000000..64c6ab777
--- /dev/null
+++ b/ivy/src/test/scala/ResolverTest.scala
@@ -0,0 +1,24 @@
+import java.net.URL
+
+import org.specs2.mutable.Specification
+import sbt._
+
+object ResolverTest extends Specification {
+
+  "Resolver" should {
+    "url" should {
+      "propagate pattern descriptorOptional and skipConsistencyCheck." in {
+        val pats = Seq("[orgPath]")
+        val patsExpected = Seq("http://foo.com/test/[orgPath]")
+        val patterns = Resolver.url("test", new URL("http://foo.com/test"))(Patterns(pats, pats, isMavenCompatible = false, descriptorOptional = true, skipConsistencyCheck = true)).patterns
+
+        patterns.ivyPatterns must equalTo(patsExpected)
+        patterns.artifactPatterns must equalTo(patsExpected)
+        patterns.isMavenCompatible must beFalse
+        patterns.skipConsistencyCheck must beTrue
+        patterns.descriptorOptional must beTrue
+      }
+    }
+  }
+
+}