diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 9e7677a42..184ca46cb 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -11,7 +11,7 @@ object Dependencies { // sbt modules val ioVersion = "1.0.0-M5" val utilVersion = "0.1.0-M12" - val librarymanagementVersion = "0.1.0-M8" + val librarymanagementVersion = "0.1.0-M9" val zincVersion = "1.0.0-M1" lazy val sbtIO = "org.scala-sbt" %% "io" % ioVersion lazy val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion diff --git a/sbt/src/sbt-test/dependency-management/default-artifact/build.sbt b/sbt/src/sbt-test/dependency-management/default-artifact/build.sbt new file mode 100644 index 000000000..89ca8a589 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/default-artifact/build.sbt @@ -0,0 +1,12 @@ +resolvers += Resolver.file("buggy", file("repo"))( + Patterns( + ivyPatterns = Seq("[organization]/[module]/[revision]/ivy.xml"), + artifactPatterns = Seq("[organization]/[module]/[revision]/[artifact].[ext]"), + isMavenCompatible = false, + descriptorOptional = true, + skipConsistencyCheck = true + ) +) + +libraryDependencies += "a" % "b" % "1.0.0" % "compile->runtime" artifacts(Artifact("b1", "jar", "jar")) +libraryDependencies += "a" % "b" % "1.0.0" % "test->runtime" artifacts(Artifact("b1", "jar", "jar")) diff --git a/sbt/src/sbt-test/dependency-management/default-artifact/repo/a/b/1.0.0/b1.jar b/sbt/src/sbt-test/dependency-management/default-artifact/repo/a/b/1.0.0/b1.jar new file mode 100644 index 000000000..619fa9368 Binary files /dev/null and b/sbt/src/sbt-test/dependency-management/default-artifact/repo/a/b/1.0.0/b1.jar differ diff --git a/sbt/src/sbt-test/dependency-management/default-artifact/repo/a/b/1.0.0/b2.jar b/sbt/src/sbt-test/dependency-management/default-artifact/repo/a/b/1.0.0/b2.jar new file mode 100644 index 000000000..619fa9368 Binary files /dev/null and b/sbt/src/sbt-test/dependency-management/default-artifact/repo/a/b/1.0.0/b2.jar differ diff --git a/sbt/src/sbt-test/dependency-management/default-artifact/repo/a/b/1.0.0/ivy.xml b/sbt/src/sbt-test/dependency-management/default-artifact/repo/a/b/1.0.0/ivy.xml new file mode 100644 index 000000000..53fe74fc9 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/default-artifact/repo/a/b/1.0.0/ivy.xml @@ -0,0 +1,14 @@ + + + a + + + + + + + + + + + diff --git a/sbt/src/sbt-test/dependency-management/default-artifact/test b/sbt/src/sbt-test/dependency-management/default-artifact/test new file mode 100644 index 000000000..cd1752ba7 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/default-artifact/test @@ -0,0 +1,5 @@ +# Verify that we successfully get the artifacts. +# This project depends on a module for which we cannot generate a "default artifact", +# because no such artifact exists. + +> update \ No newline at end of file