Support Ivy 2.3.0-final.

ivy/src/main/scala/sbt/CustomPomParser.scala

@@ -203,7 +203,7 @@ object CustomPomParser
 		val unique = IvySbt.mergeDuplicateDefinitions(withExtra)
 		unique foreach dmd.addDependency
 
-		for( ed <- md.getInheritedDescriptors) dmd.addInheritedDescriptor( new DefaultExtendsDescriptor( mrid, resolvedMrid, ed.getLocation, ed.getExtendsTypes) )
+		for( ed <- md.getInheritedDescriptors) dmd.addInheritedDescriptor( new DefaultExtendsDescriptor( md, ed.getLocation, ed.getExtendsTypes) )
 		for( conf <- md.getConfigurations) {
 			dmd.addConfiguration(conf)
 			for(art <- md.getArtifacts(conf.getName)) {

ivy/src/main/scala/sbt/Ivy.scala

@@ -310,7 +310,7 @@ private object IvySbt
 	private[this] def configureResolutionCache(settings: IvySettings, localOnly: Boolean, resCacheDir: Option[File])
 	{
 		val base = resCacheDir getOrElse settings.getDefaultResolutionCacheBasedir
-		settings.setResolutionCacheManager(new ResolutionCache(base))
+		settings.setResolutionCacheManager(new ResolutionCache(base, settings))
 	}
 	// set the artifact resolver to be the main resolver.
 	// this is because sometimes the artifact resolver saved in the cache is not correct

ivy/src/main/scala/sbt/ResolutionCache.scala

@@ -1,18 +1,24 @@
 package sbt
 
 import java.io.File
+import java.io.FileInputStream
+import java.util.Properties
 import org.apache.ivy.core
+import org.apache.ivy.plugins.parser
 import core.IvyPatternHelper
+import core.settings.IvySettings
 import core.cache.{CacheMetadataOptions, DefaultRepositoryCacheManager, DefaultResolutionCacheManager, ResolutionCacheManager}
 import core.module.id.ModuleRevisionId
+import core.module.descriptor.ModuleDescriptor
 import ResolutionCache.{Name, ReportDirectory, ResolvedName, ResolvedPattern}
+import parser.xml.XmlModuleDescriptorParser
 
 /** Replaces the standard Ivy resolution cache in order to:
 * 1. Separate cached resolved Ivy files from resolution reports, making the resolution reports easier to find.
 * 2. Have them per-project for easier cleaning (possible with standard cache, but central to this custom one).
 * 3. Cache location includes extra attributes so that cross builds of a plugin do not overwrite each other.
 */
-private[sbt] final class ResolutionCache(base: File) extends ResolutionCacheManager
+private[sbt] final class ResolutionCache(base: File, settings: IvySettings) extends ResolutionCacheManager
 {
 	private[this] def resolvedFileInCache(m: ModuleRevisionId, name: String, ext: String): File = {
 		val p = ResolvedPattern
@@ -35,6 +41,25 @@ private[sbt] final class ResolutionCache(base: File) extends ResolutionCacheMana
 		new File(reportBase, resolveId + "-" + conf + ".xml")
 	def getConfigurationResolveReportsInCache(resolveId: String): Array[File] =
 		IO.listFiles(reportBase).filter(_.getName.startsWith(resolveId + "-"))
+
+        // XXX: this method is required by ResolutionCacheManager in Ivy 2.3.0 final,
+        // but it is apparently unused by Ivy as sbt uses Ivy.  Therefore, it is 
+        // unexercised in tests.  Note that the implementation of this method in Ivy 2.3.0's 
+        // DefaultResolutionCache also resolves parent properties for a given mrid
+    def getResolvedModuleDescriptor(mrid: ModuleRevisionId): ModuleDescriptor = {
+        val ivyFile = getResolvedIvyFileInCache(mrid)
+        if (!ivyFile.exists()) {
+            throw new IllegalStateException("Ivy file not found in cache for " + mrid + "!")
+        }
+
+        return XmlModuleDescriptorParser.getInstance().parseDescriptor(settings, ivyFile.toURI().toURL(), false)
+    }
+
+    def saveResolvedModuleDescriptor(md: ModuleDescriptor): Unit = {
+        val mrid = md.getResolvedModuleRevisionId
+        val cachedIvyFile = getResolvedIvyFileInCache(mrid)
+        md.toIvyFile(cachedIvyFile)
+    }
 }
 private[sbt] object ResolutionCache
 {

launch/src/main/scala/xsbt/boot/Update.scala

@@ -286,7 +286,9 @@ final class Update(config: UpdateConfiguration)
 	private[this] def configureResolutionCache(settings: IvySettings)
 	{
 		resolutionCacheBase.mkdirs()
-		settings.setResolutionCacheManager(new DefaultResolutionCacheManager(resolutionCacheBase))
+        val drcm = new DefaultResolutionCacheManager(resolutionCacheBase)
+        drcm.setSettings(settings)
+		settings.setResolutionCacheManager(drcm)
 	}
 	private[this] def configureRepositoryCache(settings: IvySettings)
 	{

project/Util.scala

@@ -167,7 +167,7 @@ object Common
 	def lib(m: ModuleID) = libraryDependencies += m
 	lazy val jlineDep = "jline" % "jline" % "2.11"
 	lazy val jline = lib(jlineDep)
-	lazy val ivy = lib("org.apache.ivy" % "ivy" % "2.3.0-rc1")
+	lazy val ivy = lib("org.apache.ivy" % "ivy" % "2.3.0")
 	lazy val httpclient = lib("commons-httpclient" % "commons-httpclient" % "3.1")
 	lazy val jsch = lib("com.jcraft" % "jsch" % "0.1.46" intransitive() )
 	lazy val sbinary = libraryDependencies <+= Util.nightly211(n => "org.scala-tools.sbinary" % "sbinary" % "0.4.2" cross(if(n) CrossVersion.full else CrossVersion.binary))

src/sphinx/Detailed-Topics/Artifacts.rst

@@ -128,7 +128,7 @@ For example:
     Artifact("myproject", "jdk15")
 
 See the `Ivy
-documentation <http://ant.apache.org/ivy/history/2.3.0-rc1/ivyfile/dependency-artifact.html>`_
+documentation <http://ant.apache.org/ivy/history/2.3.0/ivyfile/dependency-artifact.html>`_
 for more details on artifacts. See the `Artifact
 API <../../api/sbt/Artifact$.html>`_ for
 combining the parameters above and specifying [Configurations] and extra

src/sphinx/Detailed-Topics/Library-Management.rst

@@ -124,7 +124,7 @@ the version of Scala you are using. See :doc:`Cross-Build` for details.
 Ivy can select the latest revision of a module according to constraints
 you specify. Instead of a fixed revision like `"1.6.1"`, you specify
 `"latest.integration"`, `"2.9.+"`, or `"[1.0,)"`. See the `Ivy
-revisions <http://ant.apache.org/ivy/history/2.3.0-rc1/ivyfile/dependency.html#revision>`_
+revisions <http://ant.apache.org/ivy/history/2.3.0/ivyfile/dependency.html#revision>`_
 documentation for details.
 
 Resolvers
@@ -320,7 +320,7 @@ Extra Attributes
 ~~~~~~~~~~~~~~~~
 
 `Extra
-attributes <http://ant.apache.org/ivy/history/2.3.0-rc1/concept.html#extra>`_
+attributes <http://ant.apache.org/ivy/history/2.3.0/concept.html#extra>`_
 can be specified by passing key/value pairs to the `extra` method.
 
 To select dependencies by extra attributes:
@@ -527,7 +527,7 @@ Configurations
 Ivy configurations are a useful feature for your build when you need
 custom groups of dependencies, such as for a plugin. Ivy configurations
 are essentially named sets of dependencies.  You can read the
-`Ivy documentation <http://ant.apache.org/ivy/history/2.3.0-rc1/tutorial/conf.html>`_
+`Ivy documentation <http://ant.apache.org/ivy/history/2.3.0/tutorial/conf.html>`_
 for details.
 
 The built-in use of configurations in sbt is similar to scopes in Maven.
@@ -549,7 +549,7 @@ your dependency definition:
 
 This says that your project's `"test"` configuration uses
 `ScalaTest`'s `"compile"` configuration. See the `Ivy
-documentation <http://ant.apache.org/ivy/history/2.3.0-rc1/tutorial/conf.html>`_
+documentation <http://ant.apache.org/ivy/history/2.3.0/tutorial/conf.html>`_
 for more advanced mappings. Most projects published to Maven
 repositories will use the `"compile"` configuration.
 

src/sphinx/Detailed-Topics/Publishing.rst

@@ -163,5 +163,5 @@ change the version number each time you publish. Ivy maintains a cache,
 and it stores even local projects in that cache. If Ivy already has a
 version cached, it will not check the local repository for updates,
 unless the version number matches a `changing
-pattern <http://ant.apache.org/ivy/history/2.3.0-rc1/concept.html#change>`_,
+pattern <http://ant.apache.org/ivy/history/2.3.0/concept.html#change>`_,
 and `SNAPSHOT` is one such pattern.

src/sphinx/Getting-Started/Library-Dependencies.rst

@@ -155,7 +155,7 @@ be a single fixed version. Ivy can select the latest revision of a
 module according to constraints you specify. Instead of a fixed revision
 like `"1.6.1"`, you specify `"latest.integration"`, `"2.9.+"`, or
 `"[1.0,)"`. See the `Ivy
-revisions <http://ant.apache.org/ivy/history/2.3.0-rc1/ivyfile/dependency.html#revision>`_
+revisions <http://ant.apache.org/ivy/history/2.3.0/ivyfile/dependency.html#revision>`_
 documentation for details.
 
 Resolvers