From d46087ff08ea0a1876d28a13fe9d70209a55752b Mon Sep 17 00:00:00 2001 From: Roberto Tyley Date: Fri, 8 Aug 2014 10:33:36 +0100 Subject: [PATCH] Fix pom-export of Maven Central repository Commit a1e26ca6 broke the `make-pom` & `pom-advanced` dependency-management tests by replacing one reference to `IBiblioResolver.DEFAULT_M2_ROOT` in `Resolver`, but not the other reference in `MakePom`: https://travis-ci.org/sbt/sbt/jobs/31939788#L2517-L2519 ...the secure url was no longer recognised as the default Maven Repository root, so was erroneously exported. --- ivy/src/main/scala/sbt/MakePom.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivy/src/main/scala/sbt/MakePom.scala b/ivy/src/main/scala/sbt/MakePom.scala index be3baba63..ee238371c 100644 --- a/ivy/src/main/scala/sbt/MakePom.scala +++ b/ivy/src/main/scala/sbt/MakePom.scala @@ -307,7 +307,7 @@ class MakePom(val log: Logger) { val repositories = if (includeAll) allResolvers(settings) else resolvers(settings.getDefaultResolver) val mavenRepositories = repositories.flatMap { - case m: IBiblioResolver if m.isM2compatible && m.getRoot != IBiblioResolver.DEFAULT_M2_ROOT => + case m: IBiblioResolver if m.isM2compatible && m.getRoot != DefaultMavenRepository.root => MavenRepository(m.getName, m.getRoot) :: Nil case _ => Nil }