diff --git a/sbt/src/sbt-test/dependency-management/scala-organization/build.sbt b/sbt/src/sbt-test/dependency-management/scala-organization/build.sbt
index 42d335c4d..068fe0611 100644
--- a/sbt/src/sbt-test/dependency-management/scala-organization/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/scala-organization/build.sbt
@@ -52,5 +52,5 @@ checkDependencies := {
if !m.evicted
} yield m.module.withExtraAttributes(Map.empty)).toSet
- assert(resolved == expected)
+ assert(resolved == expected, s"$resolved != $expected")
}
diff --git a/sbt/src/sbt-test/dependency-management/scala3-scala-organization/build.sbt b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/build.sbt
new file mode 100644
index 000000000..dfd1b73e5
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/build.sbt
@@ -0,0 +1,48 @@
+ThisBuild / useCoursier := false
+
+scalaOrganization := "org.other"
+scalaVersion := "3.0.0-M2"
+
+resolvers += Resolver.file("buggy", (baseDirectory in LocalRootProject).value / "repo")(
+ Patterns(
+ ivyPatterns = Vector("[organization]/[module]/[revision]/ivy.xml"),
+ artifactPatterns = Vector("[organization]/[module]/[revision]/dummy.jar"),
+ isMavenCompatible = false,
+ descriptorOptional = true,
+ skipConsistencyCheck = true
+ )
+)
+
+libraryDependencies += "org.typelevel" %% "cats-core" % "2.3.0"
+
+val checkDependencies = taskKey[Unit]("Checks that dependencies are correct.")
+
+checkDependencies := {
+ val expected: Set[ModuleID] = Set(
+ "org.scala-lang.modules" % "scala-asm" % "7.3.1-scala-1",
+ "org.jline" % "jline-reader" % "3.15.0",
+ "com.google.protobuf" % "protobuf-java" % "3.7.0",
+ "org.typelevel" % "cats-kernel_3.0.0-M2" % "2.3.0",
+ "org.jline" % "jline-terminal-jna" % "3.15.0",
+ "org.jline" % "jline-terminal" % "3.15.0",
+ "org.scala-sbt" % "compiler-interface" % "1.3.5",
+ "net.java.dev.jna" % "jna" % "5.3.1",
+ "org.other" % "scala-library" % "2.13.4",
+ "org.other" % "scala3-library_3.0.0-M2" % "3.0.0-M2",
+ "org.typelevel" % "simulacrum-scalafix-annotations_3.0.0-M2" % "0.5.1",
+ "org.other" % "scala3-compiler_3.0.0-M2" % "3.0.0-M2",
+ "org.other" % "scala3-interfaces" % "3.0.0-M2",
+ "org.other" % "tasty-core_3.0.0-M2" % "3.0.0-M2",
+ "org.typelevel" % "cats-core_3.0.0-M2" % "2.3.0",
+ "org.scala-sbt" % "util-interface" % "1.3.0"
+ )
+
+ val resolved: Set[ModuleID] =
+ (for {
+ c <- update.value.configurations
+ m <- c.modules
+ if !m.evicted
+ } yield m.module.withExtraAttributes(Map.empty)).toSet
+
+ assert(resolved == expected, s"$resolved != $expected")
+}
diff --git a/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala-library/2.13.4/dummy.jar b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala-library/2.13.4/dummy.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala-library/2.13.4/ivy.xml b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala-library/2.13.4/ivy.xml
new file mode 100644
index 000000000..6ef3dce02
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala-library/2.13.4/ivy.xml
@@ -0,0 +1,28 @@
+
+
+
+ Scala Standard Library
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala3-compiler_3.0.0-M2/3.0.0-M2/dummy.jar b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala3-compiler_3.0.0-M2/3.0.0-M2/dummy.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala3-compiler_3.0.0-M2/3.0.0-M2/ivy.xml b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala3-compiler_3.0.0-M2/3.0.0-M2/ivy.xml
new file mode 100644
index 000000000..5b6236f36
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala3-compiler_3.0.0-M2/3.0.0-M2/ivy.xml
@@ -0,0 +1,39 @@
+
+
+
+ scala3-compiler
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala3-interfaces/3.0.0-M2/dummy.jar b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala3-interfaces/3.0.0-M2/dummy.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala3-interfaces/3.0.0-M2/ivy.xml b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala3-interfaces/3.0.0-M2/ivy.xml
new file mode 100644
index 000000000..cab483d67
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala3-interfaces/3.0.0-M2/ivy.xml
@@ -0,0 +1,29 @@
+
+
+
+ scala3-interfaces
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala3-library_3.0.0-M2/3.0.0-M2/dummy.jar b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala3-library_3.0.0-M2/3.0.0-M2/dummy.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala3-library_3.0.0-M2/3.0.0-M2/ivy.xml b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala3-library_3.0.0-M2/3.0.0-M2/ivy.xml
new file mode 100644
index 000000000..593d39bb4
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/scala3-library_3.0.0-M2/3.0.0-M2/ivy.xml
@@ -0,0 +1,30 @@
+
+
+
+ scala3-library-bootstrapped
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/tasty-core_3.0.0-M2/3.0.0-M2/dummy.jar b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/tasty-core_3.0.0-M2/3.0.0-M2/dummy.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/tasty-core_3.0.0-M2/3.0.0-M2/ivy.xml b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/tasty-core_3.0.0-M2/3.0.0-M2/ivy.xml
new file mode 100644
index 000000000..5716a9b6e
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/repo/org.other/tasty-core_3.0.0-M2/3.0.0-M2/ivy.xml
@@ -0,0 +1,30 @@
+
+
+
+ tasty-core-bootstrapped
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sbt/src/sbt-test/dependency-management/scala3-scala-organization/test b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/test
new file mode 100644
index 000000000..6e1b1a750
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/scala3-scala-organization/test
@@ -0,0 +1,3 @@
+# this test is pending because the IvyDependencyResolution is not yet able
+# to override the Scala 3 artifacts
+> checkDependencies