From 49a934ffdb05918dd93a976f97a81afb3ac2269f Mon Sep 17 00:00:00 2001 From: Martin Duhem Date: Mon, 7 Mar 2016 11:37:39 +0100 Subject: [PATCH 1/3] Pending test for sbt/sbt#2431 --- .../default-artifact/build.sbt | 12 ++++++++++++ .../default-artifact/pending | 5 +++++ .../default-artifact/repo/a/b/1.0.0/b1.jar | Bin 0 -> 718 bytes .../default-artifact/repo/a/b/1.0.0/b2.jar | Bin 0 -> 718 bytes .../default-artifact/repo/a/b/1.0.0/ivy.xml | 14 ++++++++++++++ 5 files changed, 31 insertions(+) create mode 100644 sbt/src/sbt-test/dependency-management/default-artifact/build.sbt create mode 100644 sbt/src/sbt-test/dependency-management/default-artifact/pending create mode 100644 sbt/src/sbt-test/dependency-management/default-artifact/repo/a/b/1.0.0/b1.jar create mode 100644 sbt/src/sbt-test/dependency-management/default-artifact/repo/a/b/1.0.0/b2.jar create mode 100644 sbt/src/sbt-test/dependency-management/default-artifact/repo/a/b/1.0.0/ivy.xml 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/pending b/sbt/src/sbt-test/dependency-management/default-artifact/pending new file mode 100644 index 000000000..cd1752ba7 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/default-artifact/pending @@ -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 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 0000000000000000000000000000000000000000..619fa9368613a1a6314479f29f8b0ca95e9930cc GIT binary patch literal 718 zcmWIWW@Zs#;Nak3U=J|yU_b&Q3@i-3t|5-Po_=onzK(vLZmz*0dcJP|PBAci_C0gj z$6HtLBCofu*10q1HwPJ9F@Es$(;3|po@af}YJ2K1axtlX4*Jx+MnuRk#mUIKC}^Xn z!WmJ6Ptwz3#dw$hAW5{cMfv_k+GIt~~lIEjM)M>95sI z5r1_`9X+zXWa>B<)bzcAa+s@ky=LIN#I`{njqtlt@1%0XgF_Gmg?Ca)AW}o7>Idt;nB3Ajc zYBnq^>+eYTDJGpew{nkX*<#MW7LWIEPnF*4^|h3>rTIq0-_q@|FaPYnG$(zx%|-EL zN{4Tro0hg(e3`);uk6i1Q`I*Asd-#j(^Bx`ah72Ixq}r4bZ!+p?D^4qO+QbjL^7IR z>DG&aw;xx&6_sQ8`&YM7J%%|*+4F4EG@iP7Y^|gtN3=F%0IKZ2cNrVBB uc#z`^lz319uB3!)3MhV&Z2-kD0xSkH;jtay&B_LnVgkZiAZ^VA;sF3jz6q58 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..619fa9368613a1a6314479f29f8b0ca95e9930cc GIT binary patch literal 718 zcmWIWW@Zs#;Nak3U=J|yU_b&Q3@i-3t|5-Po_=onzK(vLZmz*0dcJP|PBAci_C0gj z$6HtLBCofu*10q1HwPJ9F@Es$(;3|po@af}YJ2K1axtlX4*Jx+MnuRk#mUIKC}^Xn z!WmJ6Ptwz3#dw$hAW5{cMfv_k+GIt~~lIEjM)M>95sI z5r1_`9X+zXWa>B<)bzcAa+s@ky=LIN#I`{njqtlt@1%0XgF_Gmg?Ca)AW}o7>Idt;nB3Ajc zYBnq^>+eYTDJGpew{nkX*<#MW7LWIEPnF*4^|h3>rTIq0-_q@|FaPYnG$(zx%|-EL zN{4Tro0hg(e3`);uk6i1Q`I*Asd-#j(^Bx`ah72Ixq}r4bZ!+p?D^4qO+QbjL^7IR z>DG&aw;xx&6_sQ8`&YM7J%%|*+4F4EG@iP7Y^|gtN3=F%0IKZ2cNrVBB uc#z`^lz319uB3!)3MhV&Z2-kD0xSkH;jtay&B_LnVgkZiAZ^VA;sF3jz6q58 literal 0 HcmV?d00001 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 + + + + + + + + + + + From 5e7e64e1c6be07236761272d8e78dcb4553b0b66 Mon Sep 17 00:00:00 2001 From: Martin Duhem Date: Fri, 6 May 2016 07:12:26 +0200 Subject: [PATCH 2/3] Mark test dependency-management/default-artifact as passing --- .../dependency-management/default-artifact/{pending => test} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sbt/src/sbt-test/dependency-management/default-artifact/{pending => test} (100%) diff --git a/sbt/src/sbt-test/dependency-management/default-artifact/pending b/sbt/src/sbt-test/dependency-management/default-artifact/test similarity index 100% rename from sbt/src/sbt-test/dependency-management/default-artifact/pending rename to sbt/src/sbt-test/dependency-management/default-artifact/test From 6b012b45fa0678cd368087fd6295c320d11d8498 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 6 May 2016 13:10:39 -0400 Subject: [PATCH 3/3] Bump librarymanagement to 0.1.0-M9. Ref #2500 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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