From 84e7244e4ed5b87c1ff3f164990126854f2cf1c1 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 22 Apr 2016 02:30:31 -0400 Subject: [PATCH] Fix #2519. Fixes Maven Central getting included even with repo override --- main/src/main/scala/sbt/Defaults.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 8e49c6ebf..e62eb84c8 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -1148,12 +1148,15 @@ object Classpaths { externalResolvers <<= (externalResolvers.task.?, resolvers, appResolvers, useJCenter) { case (Some(delegated), Seq(), _, _) => delegated case (_, rs, Some(ars), uj) => task { ars ++ rs } - case (_, rs, _, uj) => task { Resolver.withDefaultResolvers(rs, uj, true) } + case (_, rs, _, uj) => task { Resolver.withDefaultResolvers(rs, uj, mavenCentral = true) } }, appResolvers := { val ac = appConfiguration.value val uj = useJCenter.value - appRepositories(ac) map { ars => Resolver.reorganizeAppResolvers(ars, uj, true) } + appRepositories(ac) map { ars => + val useMavenCentral = ars contains DefaultMavenRepository + Resolver.reorganizeAppResolvers(ars, uj, useMavenCentral) + } }, bootResolvers <<= appConfiguration map bootRepositories, fullResolvers <<= (projectResolver, externalResolvers, sbtPlugin, sbtResolver, bootResolvers, overrideBuildResolvers) map { (proj, rs, isPlugin, sbtr, boot, overrideFlag) =>