From 538982928ac5935f768294b6fce89ca858c34d3e Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 25 Jun 2015 16:39:22 -0400 Subject: [PATCH] Fixes #2005. Bump to ivy 2.3.0-sbt-c5d1b95fdcc1e1007740ffbecf4eb07abc51ec93 When I went digging into Ivy's code base I discovered that it's been checking if the repository layout pattern ends with M2_PATTERN to use maven-metadata.xml, which for sbt would return false since we customize the mattern - https://github.com/apache/ant-ivy/blob/2.3.0/src/java/org/apache/ivy/plu gins/resolver/IBiblioResolver.java#L497-L499 --- project/Dependencies.scala | 2 +- .../dependency-management/dynamic-revision/build.sbt | 5 +++++ sbt/src/sbt-test/dependency-management/dynamic-revision/test | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 sbt/src/sbt-test/dependency-management/dynamic-revision/build.sbt create mode 100644 sbt/src/sbt-test/dependency-management/dynamic-revision/test diff --git a/project/Dependencies.scala b/project/Dependencies.scala index efb98ec27..55805a5ca 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -9,7 +9,7 @@ object Dependencies { lazy val scala211 = "2.11.6" lazy val jline = "jline" % "jline" % "2.11" - lazy val ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-fccfbd44c9f64523b61398a0155784dcbaeae28f" + lazy val ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-c5d1b95fdcc1e1007740ffbecf4eb07abc51ec93" lazy val jsch = "com.jcraft" % "jsch" % "0.1.46" intransitive () lazy val sbinary = "org.scala-tools.sbinary" %% "sbinary" % "0.4.2" lazy val sbtSerialization = "org.scala-sbt" %% "serialization" % "0.1.1" diff --git a/sbt/src/sbt-test/dependency-management/dynamic-revision/build.sbt b/sbt/src/sbt-test/dependency-management/dynamic-revision/build.sbt new file mode 100644 index 000000000..53db09db6 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/dynamic-revision/build.sbt @@ -0,0 +1,5 @@ +lazy val root = (project in file(".")). + settings( + libraryDependencies += "org.webjars" %% "webjars-play" % "2.1.0-3", + resolvers += Resolver.typesafeRepo("releases") + ) diff --git a/sbt/src/sbt-test/dependency-management/dynamic-revision/test b/sbt/src/sbt-test/dependency-management/dynamic-revision/test new file mode 100644 index 000000000..103bd8d2f --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/dynamic-revision/test @@ -0,0 +1 @@ +> update