diff --git a/sbt/src/sbt-test/dependency-management/inherit-repo/changes/WithRepository.sbt b/sbt/src/sbt-test/dependency-management/inherit-repo/changes/WithRepository.sbt index ea9561547..1d498ec55 100644 --- a/sbt/src/sbt-test/dependency-management/inherit-repo/changes/WithRepository.sbt +++ b/sbt/src/sbt-test/dependency-management/inherit-repo/changes/WithRepository.sbt @@ -1 +1 @@ -resolvers += "Extra Test Repository" at "http://dev.camptocamp.com/files/m2_repo/" \ No newline at end of file +externalResolvers := ("Extra Test Repository" at "http://dev.camptocamp.com/files/m2_repo/") :: Nil \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/inherit-repo/project/TestProject.scala b/sbt/src/sbt-test/dependency-management/inherit-repo/project/TestProject.scala index 1010143c6..35c67a882 100644 --- a/sbt/src/sbt-test/dependency-management/inherit-repo/project/TestProject.scala +++ b/sbt/src/sbt-test/dependency-management/inherit-repo/project/TestProject.scala @@ -4,8 +4,12 @@ object TestProject extends Build { override lazy val settings = super.settings :+ + (externalResolvers := Nil) :+ + (autoScalaLibrary := false) :+ ( ivyPaths <<= baseDirectory( dir => new IvyPaths(dir, Some(dir / "ivy-home"))) ) + lazy val root = Project("root", file(".")) aggregate(a, b) + lazy val a = Project("a", file("a")) delegateTo(b) settings( libraryDependencies += "com.camptocamp.tl.caltar" % "core" % "0.5" intransitive() ) diff --git a/sbt/src/sbt-test/dependency-management/inherit-repo/test b/sbt/src/sbt-test/dependency-management/inherit-repo/test index fc7e05710..2980cc764 100644 --- a/sbt/src/sbt-test/dependency-management/inherit-repo/test +++ b/sbt/src/sbt-test/dependency-management/inherit-repo/test @@ -1,5 +1,6 @@ +> set logLevel := Level.Debug # This should fail because project A declares a dependency that exists in an extra repository, which we haven't declared --> update +-> show update # Copy the project definition with the extra repository declared in project B and with A delegating to B and reload $ copy-file changes/WithRepository.sbt b/build.sbt