From 7a124bd2dfbaa3a30ca88b9f19f3407ba0a2675c Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Tue, 26 May 2015 23:25:08 +0100
Subject: [PATCH] Fix bincompat for project-level excludes in the POM.

---
 ivy/src/main/scala/sbt/MakePom.scala | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/ivy/src/main/scala/sbt/MakePom.scala b/ivy/src/main/scala/sbt/MakePom.scala
index ffd189932..4e0ed0118 100644
--- a/ivy/src/main/scala/sbt/MakePom.scala
+++ b/ivy/src/main/scala/sbt/MakePom.scala
@@ -220,6 +220,10 @@ class MakePom(val log: Logger) {
     }
   val IgnoreTypes: Set[String] = Set(Artifact.SourceType, Artifact.DocType, Artifact.PomType)
 
+  @deprecated("Use `makeDependencies` variant which takes excludes", "0.13.9")
+  def makeDependencies(dependencies: Seq[DependencyDescriptor], includeTypes: Set[String]): NodeSeq =
+    makeDependencies(dependencies, includeTypes, Nil)
+
   def makeDependencies(dependencies: Seq[DependencyDescriptor], includeTypes: Set[String], excludes: Seq[ExcludeRule]): NodeSeq =
     if (dependencies.isEmpty)
       NodeSeq.Empty
@@ -228,6 +232,10 @@ class MakePom(val log: Logger) {
         { dependencies.map(makeDependency(_, includeTypes, excludes)) }
       </dependencies>
 
+  @deprecated("Use `makeDependency` variant which takes excludes", "0.13.9")
+  def makeDependency(dependency: DependencyDescriptor, includeTypes: Set[String]): NodeSeq =
+    makeDependency(dependency, includeTypes, Nil)
+
   def makeDependency(dependency: DependencyDescriptor, includeTypes: Set[String], excludes: Seq[ExcludeRule]): NodeSeq =
     {
       val artifacts = dependency.getAllDependencyArtifacts
@@ -244,6 +252,10 @@ class MakePom(val log: Logger) {
         NodeSeq.fromSeq(artifacts.flatMap(a => makeDependencyElem(dependency, a, excludes)))
     }
 
+  @deprecated("Use `makeDependencyElem` variant which takes excludes", "0.13.9")
+  def makeDependencyElem(dependency: DependencyDescriptor, artifact: DependencyArtifactDescriptor): Option[Elem] =
+    makeDependencyElem(dependency, artifact, Nil)
+
   def makeDependencyElem(dependency: DependencyDescriptor, artifact: DependencyArtifactDescriptor, excludes: Seq[ExcludeRule]): Option[Elem] =
     {
       val configs = artifact.getConfigurations.toList match {
@@ -261,6 +273,11 @@ class MakePom(val log: Logger) {
         Some(makeDependencyElem(dependency, scope, optional, classifier, tpe, excludes))
       } else None
     }
+
+  @deprecated("Use `makeDependencyElem` variant which takes excludes", "0.13.9")
+  def makeDependencyElem(dependency: DependencyDescriptor, scope: Option[String], optional: Boolean, classifier: Option[String], tpe: Option[String]): Elem =
+    makeDependencyElem(dependency, scope, optional, classifier, tpe, Nil)
+
   def makeDependencyElem(dependency: DependencyDescriptor, scope: Option[String], optional: Boolean, classifier: Option[String], tpe: Option[String], excludes: Seq[ExcludeRule]): Elem =
     {
       val mrid = dependency.getDependencyRevisionId
@@ -322,6 +339,9 @@ class MakePom(val log: Logger) {
       (scope, opt.nonEmpty)
     }
 
+  @deprecated("Use `exclusions` variant which takes excludes", "0.13.9")
+  def exclusions(dependency: DependencyDescriptor): NodeSeq = exclusions(dependency, Nil)
+
   def exclusions(dependency: DependencyDescriptor, excludes: Seq[ExcludeRule]): NodeSeq =
     {
       val excl = dependency.getExcludeRules(dependency.getModuleConfigurations) ++ excludes