From b25fc2bd00a809d78fbb13f93837e96274688327 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Mon, 3 Mar 2014 12:10:37 -0500
Subject: [PATCH] Fix #1136 - Ivy's `+` dependencies not converted to maven
 style syntax.

* Attempt to convert dependencies that end in `+` into maven-style version range
* if a failure occurs, just use the original version (could be bad...).
---
 ivy/src/main/scala/sbt/MakePom.scala | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/ivy/src/main/scala/sbt/MakePom.scala b/ivy/src/main/scala/sbt/MakePom.scala
index 5e49243d3..4c4b7c8d0 100644
--- a/ivy/src/main/scala/sbt/MakePom.scala
+++ b/ivy/src/main/scala/sbt/MakePom.scala
@@ -188,7 +188,7 @@ class MakePom(val log: Logger)
 		<dependency>
 			<groupId>{mrid.getOrganisation}</groupId>
 			<artifactId>{mrid.getName}</artifactId>
-			<version>{mrid.getRevision}</version>
+			<version>{makeDependencyVersion(mrid.getRevision)}</version>
 			{ scopeElem(scope) }
 			{ optionalElem(optional) }
 			{ classifierElem(classifier) }
@@ -197,6 +197,25 @@ class MakePom(val log: Logger)
 		</dependency>
 	}
 
+
+
+	def makeDependencyVersion(revision: String): String = {
+		if(revision endsWith "+") try {
+			// TODO - this is the slowest possible implementation.
+			val beforePlus = revision.reverse.dropWhile(_ != '.').drop(1).reverse
+			val lastVersion = beforePlus.reverse.takeWhile(_ != '.').reverse
+			val lastVersionInt = lastVersion.toInt
+			val prefixVersion = beforePlus.reverse.dropWhile(_ != '.').drop(1).reverse
+			s"[$beforePlus, ${prefixVersion}.${lastVersionInt+1})"
+		} catch {
+			case e: NumberFormatException => 
+			  // TODO - if the version deosn't meet our expectations, maybe we just issue a hard
+			  //        error instead of softly ignoring the attempt to rewrite.
+			  //sys.error(s"Could not fix version [$revision] into maven style version")
+			  revision
+		} else revision
+	}
+
 	@deprecated("No longer used and will be removed.", "0.12.1")
 	def classifier(dependency: DependencyDescriptor, includeTypes: Set[String]): NodeSeq =
 	{