diff --git a/sbt/src/sbt-test/dependency-management/transitive-excludes/build.sbt b/sbt/src/sbt-test/dependency-management/transitive-excludes/build.sbt index 5a04d1401..2776e4448 100644 --- a/sbt/src/sbt-test/dependency-management/transitive-excludes/build.sbt +++ b/sbt/src/sbt-test/dependency-management/transitive-excludes/build.sbt @@ -11,6 +11,8 @@ val checkDependencies = taskKey[Unit]("Checks that dependcies are correct.") checkDependencies := { val hasBadJar = (fullClasspath in Compile).value.exists { jar => jar.data.getName contains "bottom-1.0.0.jar"} val errorJarString = (fullClasspath in Compile).value.map(_.data.getName).mkString(" * ", "\n * ", "") + val hasBadMiddleJar = (fullClasspath in Compile).value.exists { jar => jar.data.getName contains "middle-1.0.0.jar"} + assert(!hasBadMiddleJar, s"Failed to exclude excluded dependency on classpath!\nFound:\n$errorJarString") assert(!hasBadJar, s"Failed to exclude transitive excluded dependency on classpath!\nFound:\n$errorJarString") val modules = (for { @@ -22,7 +24,12 @@ checkDependencies := { modules exists { m => (m.organization == "exclude.test") && (m.name == "bottom") } + val hasBadMiddleDep = + modules exists { m => + (m.organization == "exclude.test") && (m.name == "middle") + } val errModuleString = modules.mkString("\n * ", "\n * ", "") + assert(!hasBadMiddleDep, s"Failed to exclude transitive excluded dependency!\nFound:\n$errModuleString") assert(!hasBadDep, s"Failed to exclude transitive excluded dependency!\nFound:\n$errModuleString") } \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/transitive-excludes/repository/exclude/test/app/1.0.0/app-1.0.0.pom b/sbt/src/sbt-test/dependency-management/transitive-excludes/repository/exclude/test/app/1.0.0/app-1.0.0.pom index ba115f816..801b7ddf3 100644 --- a/sbt/src/sbt-test/dependency-management/transitive-excludes/repository/exclude/test/app/1.0.0/app-1.0.0.pom +++ b/sbt/src/sbt-test/dependency-management/transitive-excludes/repository/exclude/test/app/1.0.0/app-1.0.0.pom @@ -12,6 +12,12 @@ exclude.test top 1.0.0 + + + exclude.test + middle + + \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/transitive-excludes/repository/exclude/test/top/1.0.0/top-1.0.0.pom b/sbt/src/sbt-test/dependency-management/transitive-excludes/repository/exclude/test/top/1.0.0/top-1.0.0.pom index 912f10b7a..2cad5b396 100644 --- a/sbt/src/sbt-test/dependency-management/transitive-excludes/repository/exclude/test/top/1.0.0/top-1.0.0.pom +++ b/sbt/src/sbt-test/dependency-management/transitive-excludes/repository/exclude/test/top/1.0.0/top-1.0.0.pom @@ -12,12 +12,6 @@ exclude.test middle 1.0.0 - - - exclude.test - middle - - \ No newline at end of file