diff --git a/launch/src/main/input_resources/sbt/sbt.boot.properties b/launch/src/main/input_resources/sbt/sbt.boot.properties index 9234be5f8..0519c9b20 100644 --- a/launch/src/main/input_resources/sbt/sbt.boot.properties +++ b/launch/src/main/input_resources/sbt/sbt.boot.properties @@ -12,6 +12,8 @@ [repositories] local + local-preloaded-ivy: file://${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/}, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext] + local-preloaded: file://${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/} maven-central typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly sbt-ivy-snapshots: https://repo.scala-sbt.org/scalasbt/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly diff --git a/sbt/src/sbt-test/dependency-management/make-pom/build.sbt b/sbt/src/sbt-test/dependency-management/make-pom/build.sbt index adc041a9c..e81c889da 100644 --- a/sbt/src/sbt-test/dependency-management/make-pom/build.sbt +++ b/sbt/src/sbt-test/dependency-management/make-pom/build.sbt @@ -49,7 +49,7 @@ lazy val checkPom = (readPom, fullResolvers) map { (pomXML, ivyRepositories) => val repositories = repositoriesElement \ "repository" val writtenRepositories = repositories.map(read).distinct val mavenStyleRepositories = ivyRepositories.collect { - case x: MavenRepository if (x.name != "public") && (x.name != "jcenter") => normalize(x) + case x: MavenRepository if (x.name != "public") && (x.name != "jcenter") && !(x.root startsWith "file:") => normalize(x) } distinct; lazy val explain = (("Written:" +: writtenRepositories) ++ ("Declared:" +: mavenStyleRepositories)).mkString("\n\t") diff --git a/sbt/src/sbt-test/dependency-management/pom-advanced/build.sbt b/sbt/src/sbt-test/dependency-management/pom-advanced/build.sbt index 8db20a07c..e0adad018 100644 --- a/sbt/src/sbt-test/dependency-management/pom-advanced/build.sbt +++ b/sbt/src/sbt-test/dependency-management/pom-advanced/build.sbt @@ -12,8 +12,13 @@ lazy val root = (project in file(".")). val local = "local-maven-repo" at "file://" + (Path.userHome / ".m2" /"repository").absolutePath -def pomIncludeRepository(base: File, prev: MavenRepository => Boolean) = (r: MavenRepository) => - if(base / "repo.none" exists) false else if(base / "repo.all" exists) true else prev(r) +def pomIncludeRepository(base: File, prev: MavenRepository => Boolean): MavenRepository => Boolean = + { + case r: MavenRepository if (r.name == "local-preloaded") => false + case r: MavenRepository if (base / "repo.none" exists) => false + case r: MavenRepository if (base / "repo.all" exists) => true + case r: MavenRepository => prev(r) + } def addSlash(s: String): String = s match {