From 73cc49cd71141feeb99f6db71ff3594b6e819431 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Thu, 9 Jan 2020 14:47:55 -0500
Subject: [PATCH 1/2] Update repo override test

Fixes https://github.com/sbt/sbt/issues/5335
---
 .../dependency-management/default-resolvers/build.sbt           | 1 -
 sbt/src/repo-override-test/repo.config                          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/sbt/src/repo-override-test/dependency-management/default-resolvers/build.sbt b/sbt/src/repo-override-test/dependency-management/default-resolvers/build.sbt
index c4cdbcd8d..ea3986b88 100644
--- a/sbt/src/repo-override-test/dependency-management/default-resolvers/build.sbt
+++ b/sbt/src/repo-override-test/dependency-management/default-resolvers/build.sbt
@@ -4,7 +4,6 @@ lazy val root = (project in file(".")).settings(
   autoScalaLibrary := false,
   check := {
     val ar = appResolvers.value.get
-    assert(!(ar exists { _.name == "jcenter" }))
     assert(!(ar exists { _.name == "public" }))
   }
 )
diff --git a/sbt/src/repo-override-test/repo.config b/sbt/src/repo-override-test/repo.config
index da40e19cc..68dbabf81 100644
--- a/sbt/src/repo-override-test/repo.config
+++ b/sbt/src/repo-override-test/repo.config
@@ -1,3 +1,3 @@
 [repositories]
   local
-  sonatype-oss-public: https://oss.sonatype.org/content/repositories/public/
+  jcenter: https://jcenter.bintray.com/

From 30a3d3af457458239a0927998ca216a450368fc8 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Thu, 9 Jan 2020 13:14:04 -0500
Subject: [PATCH 2/2] lm-coursier-shaded 2.0.0-RC5-3

Fixes https://github.com/sbt/sbt/issues/5333
Fixes https://github.com/sbt/sbt/issues/5324
Fixes https://github.com/sbt/sbt/issues/5268
Ref https://github.com/sbt/sbt/issues/5282
---
 project/Dependencies.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 872b7f86c..1f659ade1 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -112,7 +112,7 @@ object Dependencies {
   def addSbtZincCompileCore(p: Project): Project =
     addSbtModule(p, sbtZincPath, "zincCompileCore", zincCompileCore)
 
-  val lmCoursierVersion = "2.0.0-RC5-2"
+  val lmCoursierVersion = "2.0.0-RC5-3"
   val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % lmCoursierVersion
 
   val sjsonNewScalaJson = Def.setting {