From cac2d5ad7ba2a06c7a50ba029733af6e5df4f476 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sat, 4 Mar 2017 12:55:13 -0500
Subject: [PATCH 1/2] Add local-preloaded repo

---
 launch/src/main/input_resources/sbt/sbt.boot.properties  | 2 ++
 .../sbt-test/dependency-management/make-pom/build.sbt    | 2 +-
 .../dependency-management/pom-advanced/build.sbt         | 9 +++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/launch/src/main/input_resources/sbt/sbt.boot.properties b/launch/src/main/input_resources/sbt/sbt.boot.properties
index 0d3a64bb3..cf1fb4127 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
   sbt-maven-releases: https://repo.scala-sbt.org/scalasbt/maven-releases/, bootOnly
   sbt-maven-snapshots: https://repo.scala-sbt.org/scalasbt/maven-snapshots/, 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 06cbc59f8..8a060d896 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 7ca4464e7..4fa6a2805 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 {

From 9dac6e910d691c5d68bc7641fc771cbbf2df1fb6 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Tue, 4 Apr 2017 19:22:09 -0400
Subject: [PATCH 2/2] Split dependency-management tests

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 20fc55510..c39d887fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,8 +23,10 @@ env:
     - SBT_CMD="scripted actions/*"
     - SBT_CMD="scripted apiinfo/*"
     - SBT_CMD="scripted compiler-project/*"
-    - SBT_CMD="scripted dependency-management/*1of2"
-    - SBT_CMD="scripted dependency-management/*2of2"
+    - SBT_CMD="scripted dependency-management/*1of4"
+    - SBT_CMD="scripted dependency-management/*2of4"
+    - SBT_CMD="scripted dependency-management/*3of4"
+    - SBT_CMD="scripted dependency-management/*4of4"
     - SBT_CMD="scripted ivy-deps-management/*"
     - SBT_CMD="scripted java/*"
     - SBT_CMD="scripted package/*"