luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.13.5' into wip/fix-doc-generation 

Conflicts:
	project/Sbt.scala
This commit is contained in:
Josh Suereth 2014-05-28 09:09:51 -04:00
parent af70a895de b69a273f37
commit 89091ca4fc
14 changed files with 67 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ivy/src/main/scala/sbt/ConvertResolver.scala
View File

@ -5,15 +5,14 @@ package sbt
import java.net.URL import java.net.URL
import java.util.Collections import java.util.Collections
import org.apache.ivy.{ core, plugins } import org.apache.ivy.core.module.id.ModuleRevisionId
import core.module.id.ModuleRevisionId import org.apache.ivy.core.module.descriptor.DependencyDescriptor
import core.module.descriptor.DependencyDescriptor import org.apache.ivy.core.resolve.ResolveData
import core.resolve.ResolveData import org.apache.ivy.core.settings.IvySettings
import core.settings.IvySettings import org.apache.ivy.plugins.resolver.{BasicResolver, DependencyResolver, IBiblioResolver, RepositoryResolver}
import plugins.resolver.{ BasicResolver, DependencyResolver, IBiblioResolver, RepositoryResolver } import org.apache.ivy.plugins.resolver.{AbstractPatternsBasedResolver, AbstractSshBasedResolver, FileSystemResolver, SFTPResolver, SshResolver, URLResolver}
import plugins.resolver.{ AbstractPatternsBasedResolver, AbstractSshBasedResolver, FileSystemResolver, SFTPResolver, SshResolver, URLResolver } import org.apache.ivy.plugins.repository.url.{URLRepository => URLRepo}
import plugins.repository.url.{ URLRepository => URLRepo } import org.apache.ivy.plugins.repository.file.{FileRepository => FileRepo, FileResource}
import plugins.repository.file.{ FileRepository => FileRepo, FileResource }
import java.io.File import java.io.File
import org.apache.ivy.util.ChecksumHelper import org.apache.ivy.util.ChecksumHelper
import org.apache.ivy.core.module.descriptor.{ Artifact => IArtifact } import org.apache.ivy.core.module.descriptor.{ Artifact => IArtifact }

17
ivy/src/main/scala/sbt/CustomPomParser.scala
View File

@ -1,14 +1,13 @@
package sbt package sbt
import org.apache.ivy.{ core, plugins, util } import org.apache.ivy.core.module.id.ModuleRevisionId
import core.module.id.ModuleRevisionId import org.apache.ivy.core.module.descriptor.{DefaultArtifact, DefaultExtendsDescriptor, DefaultModuleDescriptor, ModuleDescriptor}
import core.module.descriptor.{ DefaultArtifact, DefaultExtendsDescriptor, DefaultModuleDescriptor, ModuleDescriptor } import org.apache.ivy.core.module.descriptor.{DefaultDependencyDescriptor, DependencyDescriptor}
import core.module.descriptor.{ DefaultDependencyDescriptor, DependencyDescriptor } import org.apache.ivy.plugins.parser.{ModuleDescriptorParser, ModuleDescriptorParserRegistry, ParserSettings}
import plugins.parser.{ m2, ModuleDescriptorParser, ModuleDescriptorParserRegistry, ParserSettings } import org.apache.ivy.plugins.parser.m2.{PomModuleDescriptorBuilder, PomModuleDescriptorParser}
import m2.{ PomModuleDescriptorBuilder, PomModuleDescriptorParser } import org.apache.ivy.plugins.repository.Resource
import plugins.repository.Resource import org.apache.ivy.plugins.namespace.NamespaceTransformer
import plugins.namespace.NamespaceTransformer import org.apache.ivy.util.extendable.ExtendableItem
import util.extendable.ExtendableItem
import java.io.{ File, InputStream } import java.io.{ File, InputStream }
import java.net.URL import java.net.URL

11
ivy/src/main/scala/sbt/CustomXmlParser.scala
View File

@ -6,12 +6,11 @@ package sbt
import java.io.ByteArrayInputStream import java.io.ByteArrayInputStream
import java.net.URL import java.net.URL
import org.apache.ivy.{ core, plugins } import org.apache.ivy.core.module.descriptor.{DefaultDependencyDescriptor, DefaultModuleDescriptor}
import core.module.descriptor.{ DefaultDependencyDescriptor, DefaultModuleDescriptor } import org.apache.ivy.core.settings.IvySettings
import core.settings.IvySettings import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser
import plugins.parser.xml.XmlModuleDescriptorParser import org.apache.ivy.plugins.repository.Resource
import plugins.repository.Resource import org.apache.ivy.plugins.repository.url.URLResource
import plugins.repository.url.URLResource
/** Subclasses the default Ivy file parser in order to provide access to protected methods.*/ /** Subclasses the default Ivy file parser in order to provide access to protected methods.*/
private[sbt] object CustomXmlParser extends XmlModuleDescriptorParser { private[sbt] object CustomXmlParser extends XmlModuleDescriptorParser {

30
ivy/src/main/scala/sbt/Ivy.scala
View File

@ -11,21 +11,21 @@ import java.util.concurrent.Callable
import java.util.{ Collection, Collections => CS } import java.util.{ Collection, Collections => CS }
import CS.singleton import CS.singleton
import org.apache.ivy.{ core, plugins, util, Ivy } import org.apache.ivy.Ivy
import core.{ IvyPatternHelper, LogOptions } import org.apache.ivy.core.{IvyPatternHelper, LogOptions}
import core.cache.{ CacheMetadataOptions, DefaultRepositoryCacheManager, ModuleDescriptorWriter } import org.apache.ivy.core.cache.{CacheMetadataOptions, DefaultRepositoryCacheManager, ModuleDescriptorWriter}
import core.module.descriptor.{ Artifact => IArtifact, DefaultArtifact, DefaultDependencyArtifactDescriptor, MDArtifact } import org.apache.ivy.core.module.descriptor.{Artifact => IArtifact, DefaultArtifact, DefaultDependencyArtifactDescriptor, MDArtifact}
import core.module.descriptor.{ DefaultDependencyDescriptor, DefaultModuleDescriptor, DependencyDescriptor, ModuleDescriptor, License } import org.apache.ivy.core.module.descriptor.{DefaultDependencyDescriptor, DefaultModuleDescriptor, DependencyDescriptor, ModuleDescriptor, License}
import core.module.descriptor.{ OverrideDependencyDescriptorMediator } import org.apache.ivy.core.module.descriptor.{OverrideDependencyDescriptorMediator}
import core.module.id.{ ArtifactId, ModuleId, ModuleRevisionId } import org.apache.ivy.core.module.id.{ArtifactId,ModuleId, ModuleRevisionId}
import core.resolve.{ IvyNode, ResolveData, ResolvedModuleRevision } import org.apache.ivy.core.resolve.{IvyNode, ResolveData, ResolvedModuleRevision}
import core.settings.IvySettings import org.apache.ivy.core.settings.IvySettings
import plugins.latest.LatestRevisionStrategy import org.apache.ivy.plugins.latest.LatestRevisionStrategy
import plugins.matcher.PatternMatcher import org.apache.ivy.plugins.matcher.PatternMatcher
import plugins.parser.m2.PomModuleDescriptorParser import org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser
import plugins.resolver.{ ChainResolver, DependencyResolver } import org.apache.ivy.plugins.resolver.{ChainResolver, DependencyResolver}
import util.{ Message, MessageLogger } import org.apache.ivy.util.{Message, MessageLogger}
import util.extendable.ExtendableItem import org.apache.ivy.util.extendable.ExtendableItem
import scala.xml.{ NodeSeq, Text } import scala.xml.{ NodeSeq, Text }

16
ivy/src/main/scala/sbt/IvyActions.scala
View File

@ -6,14 +6,14 @@ package sbt
import java.io.File import java.io.File
import scala.xml.{ Node => XNode, NodeSeq } import scala.xml.{ Node => XNode, NodeSeq }
import org.apache.ivy.{ core, plugins, Ivy } import org.apache.ivy.Ivy
import core.{ IvyPatternHelper, LogOptions } import org.apache.ivy.core.{IvyPatternHelper, LogOptions}
import core.deliver.DeliverOptions import org.apache.ivy.core.deliver.DeliverOptions
import core.install.InstallOptions import org.apache.ivy.core.install.InstallOptions
import core.module.descriptor.{ Artifact => IArtifact, MDArtifact, ModuleDescriptor, DefaultModuleDescriptor } import org.apache.ivy.core.module.descriptor.{Artifact => IArtifact, MDArtifact, ModuleDescriptor, DefaultModuleDescriptor}
import core.report.ResolveReport import org.apache.ivy.core.report.ResolveReport
import core.resolve.ResolveOptions import org.apache.ivy.core.resolve.ResolveOptions
import plugins.resolver.{ BasicResolver, DependencyResolver } import org.apache.ivy.plugins.resolver.{BasicResolver, DependencyResolver}
final class DeliverConfiguration(val deliverIvyPattern: String, val status: String, val configurations: Option[Seq[Configuration]], val logging: UpdateLogging.Value) final class DeliverConfiguration(val deliverIvyPattern: String, val status: String, val configurations: Option[Seq[Configuration]], val logging: UpdateLogging.Value)
final class PublishConfiguration(val ivyFile: Option[File], val resolverName: String, val artifacts: Map[Artifact, File], val checksums: Seq[String], val logging: UpdateLogging.Value, final class PublishConfiguration(val ivyFile: Option[File], val resolverName: String, val artifacts: Map[Artifact, File], val checksums: Seq[String], val logging: UpdateLogging.Value,

13
ivy/src/main/scala/sbt/IvyCache.scala
View File

@ -6,13 +6,12 @@ package sbt
import java.io.File import java.io.File
import java.net.URL import java.net.URL
import org.apache.ivy.{ core, plugins, util } import org.apache.ivy.core.cache.{ArtifactOrigin, CacheDownloadOptions, DefaultRepositoryCacheManager}
import core.cache.{ ArtifactOrigin, CacheDownloadOptions, DefaultRepositoryCacheManager } import org.apache.ivy.core.module.descriptor.{Artifact => IvyArtifact, DefaultArtifact}
import core.module.descriptor.{ Artifact => IvyArtifact, DefaultArtifact } import org.apache.ivy.plugins.repository.file.{FileRepository=>IvyFileRepository, FileResource}
import plugins.repository.file.{ FileRepository => IvyFileRepository, FileResource } import org.apache.ivy.plugins.repository.{ArtifactResourceResolver, Resource, ResourceDownloader}
import plugins.repository.{ ArtifactResourceResolver, Resource, ResourceDownloader } import org.apache.ivy.plugins.resolver.util.ResolvedResource
import plugins.resolver.util.ResolvedResource import org.apache.ivy.util.FileUtil
import util.FileUtil
class NotInCache(val id: ModuleID, cause: Throwable) class NotInCache(val id: ModuleID, cause: Throwable)
extends RuntimeException(NotInCache(id, cause), cause) { extends RuntimeException(NotInCache(id, cause), cause) {

9
ivy/src/main/scala/sbt/IvyScala.scala
View File

@ -6,11 +6,10 @@ package sbt
import java.util.Collections.emptyMap import java.util.Collections.emptyMap
import scala.collection.mutable.HashSet import scala.collection.mutable.HashSet
import org.apache.ivy.{ core, plugins } import org.apache.ivy.core.module.descriptor.{DefaultExcludeRule, ExcludeRule}
import core.module.descriptor.{ DefaultExcludeRule, ExcludeRule } import org.apache.ivy.core.module.descriptor.{DependencyDescriptor, DefaultModuleDescriptor, ModuleDescriptor, OverrideDependencyDescriptorMediator}
import core.module.descriptor.{ DependencyDescriptor, DefaultModuleDescriptor, ModuleDescriptor, OverrideDependencyDescriptorMediator } import org.apache.ivy.core.module.id.{ArtifactId,ModuleId, ModuleRevisionId}
import core.module.id.{ ArtifactId, ModuleId, ModuleRevisionId } import org.apache.ivy.plugins.matcher.ExactPatternMatcher
import plugins.matcher.ExactPatternMatcher
object ScalaArtifacts { object ScalaArtifacts {
import xsbti.ArtifactInfo._ import xsbti.ArtifactInfo._

8
ivy/src/main/scala/sbt/MakePom.scala
View File

@ -13,10 +13,10 @@ import java.io.File
import scala.xml.{ Elem, Node => XNode, NodeSeq, PrettyPrinter, PrefixedAttribute } import scala.xml.{ Elem, Node => XNode, NodeSeq, PrettyPrinter, PrefixedAttribute }
import Configurations.Optional import Configurations.Optional
import org.apache.ivy.{ core, plugins, Ivy } import org.apache.ivy.Ivy
import core.settings.IvySettings import org.apache.ivy.core.settings.IvySettings
import core.module.descriptor.{ DependencyArtifactDescriptor, DependencyDescriptor, License, ModuleDescriptor, ExcludeRule } import org.apache.ivy.core.module.descriptor.{DependencyArtifactDescriptor, DependencyDescriptor, License, ModuleDescriptor, ExcludeRule}
import plugins.resolver.{ ChainResolver, DependencyResolver, IBiblioResolver } import org.apache.ivy.plugins.resolver.{ChainResolver, DependencyResolver, IBiblioResolver}
class MakePom(val log: Logger) { class MakePom(val log: Logger) {
@deprecated("Use `write(Ivy, ModuleDescriptor, ModuleInfo, Option[Iterable[Configuration]], Set[String], NodeSeq, XNode => XNode, MavenRepository => Boolean, Boolean, File)` instead", "0.11.2") @deprecated("Use `write(Ivy, ModuleDescriptor, ModuleInfo, Option[Iterable[Configuration]], Set[String], NodeSeq, XNode => XNode, MavenRepository => Boolean, Boolean, File)` instead", "0.11.2")

7
ivy/src/main/scala/sbt/ProjectResolver.scala
View File

@ -6,14 +6,13 @@ package sbt
import java.io.File import java.io.File
import java.util.Date import java.util.Date
import org.apache.ivy.{ core, plugins } import org.apache.ivy.core.{cache,module, report, resolve,search}
import core.{ cache, module, report, resolve, search }
import cache.{ ArtifactOrigin, RepositoryCacheManager } import cache.{ ArtifactOrigin, RepositoryCacheManager }
import search.{ ModuleEntry, OrganisationEntry, RevisionEntry } import search.{ ModuleEntry, OrganisationEntry, RevisionEntry }
import module.id.ModuleRevisionId import module.id.ModuleRevisionId
import module.descriptor.{ Artifact => IArtifact, DefaultArtifact, DependencyDescriptor, ModuleDescriptor } import module.descriptor.{ Artifact => IArtifact, DefaultArtifact, DependencyDescriptor, ModuleDescriptor }
import plugins.namespace.Namespace import org.apache.ivy.plugins.namespace.Namespace
import plugins.resolver.{ DependencyResolver, ResolverSettings } import org.apache.ivy.plugins.resolver.{DependencyResolver,ResolverSettings}
import report.{ ArtifactDownloadReport, DownloadReport, DownloadStatus, MetadataArtifactDownloadReport } import report.{ ArtifactDownloadReport, DownloadReport, DownloadStatus, MetadataArtifactDownloadReport }
import resolve.{ DownloadOptions, ResolveData, ResolvedModuleRevision } import resolve.{ DownloadOptions, ResolveData, ResolvedModuleRevision }

2
project/Util.scala
View File

@ -174,7 +174,7 @@ object Common {
def lib(m: ModuleID) = libraryDependencies += m def lib(m: ModuleID) = libraryDependencies += m
lazy val jlineDep = "jline" % "jline" % "2.11" lazy val jlineDep = "jline" % "jline" % "2.11"
lazy val jline = lib(jlineDep) lazy val jline = lib(jlineDep)
lazy val ivy = lib("org.scala-sbt.ivy" % "ivy" % "2.4.0-sbt-d6fca11d63402c92e4167cdf2da91a660d043392") lazy val ivy = lib("org.apache.ivy" % "ivy" % "2.3.0")
lazy val httpclient = lib("commons-httpclient" % "commons-httpclient" % "3.1") lazy val httpclient = lib("commons-httpclient" % "commons-httpclient" % "3.1")
lazy val jsch = lib("com.jcraft" % "jsch" % "0.1.46" intransitive ()) lazy val jsch = lib("com.jcraft" % "jsch" % "0.1.46" intransitive ())
lazy val sbinary = libraryDependencies += "org.scala-tools.sbinary" %% "sbinary" % "0.4.2" lazy val sbinary = libraryDependencies += "org.scala-tools.sbinary" %% "sbinary" % "0.4.2"

3
src/main/conscript/sbt/launchconfig
View File

@ -4,7 +4,7 @@
[app] [app]
org: ${sbt.organization-org.scala-sbt} org: ${sbt.organization-org.scala-sbt}
name: sbt name: sbt
version: ${sbt.version-read(sbt.version)[0.13.5-SNAPSHOT]} version: ${sbt.version-read(sbt.version)[0.13.5]}
class: sbt.xMain class: sbt.xMain
components: xsbti,extra components: xsbti,extra
cross-versioned: ${sbt.cross.versioned-false} cross-versioned: ${sbt.cross.versioned-false}
@ -13,7 +13,6 @@
[repositories] [repositories]
local local
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
typesafe-ivy-snapshots: http://repo.typesafe.com/typesafe/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
maven-central maven-central
[boot] [boot]

3
src/main/conscript/scalas/launchconfig
View File

@ -4,7 +4,7 @@
[app] [app]
org: ${sbt.organization-org.scala-sbt} org: ${sbt.organization-org.scala-sbt}
name: sbt name: sbt
version: ${sbt.version-read(sbt.version)[0.13.5-SNAPSHOT]} version: ${sbt.version-read(sbt.version)[0.13.5]}
class: sbt.ScriptMain class: sbt.ScriptMain
components: xsbti,extra components: xsbti,extra
cross-versioned: ${sbt.cross.versioned-false} cross-versioned: ${sbt.cross.versioned-false}
@ -13,7 +13,6 @@
[repositories] [repositories]
local local
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
typesafe-ivy-snapshots: http://repo.typesafe.com/typesafe/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
maven-central maven-central
[boot] [boot]

3
src/main/conscript/screpl/launchconfig
View File

@ -4,7 +4,7 @@
[app] [app]
org: ${sbt.organization-org.scala-sbt} org: ${sbt.organization-org.scala-sbt}
name: sbt name: sbt
version: ${sbt.version-read(sbt.version)[0.13.5-SNAPSHOT]} version: ${sbt.version-read(sbt.version)[0.13.5]}
class: sbt.ConsoleMain class: sbt.ConsoleMain
components: xsbti,extra components: xsbti,extra
cross-versioned: ${sbt.cross.versioned-false} cross-versioned: ${sbt.cross.versioned-false}
@ -13,7 +13,6 @@
[repositories] [repositories]
local local
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
typesafe-ivy-snapshots: http://repo.typesafe.com/typesafe/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
maven-central maven-central
[boot] [boot]

4
testing/src/main/scala/sbt/JUnitXmlTestsListener.scala
View File

@ -4,7 +4,7 @@ import java.io.{ StringWriter, PrintWriter, File }
import java.net.InetAddress import java.net.InetAddress
import scala.collection.mutable.ListBuffer import scala.collection.mutable.ListBuffer
import scala.util.DynamicVariable import scala.util.DynamicVariable
import scala.xml.{ Elem, Node, XML } import scala.xml.{Elem, Node=>XNode, XML}
import testing.{ Event => TEvent, Status => TStatus, OptionalThrowable, TestSelector } import testing.{ Event => TEvent, Status => TStatus, OptionalThrowable, TestSelector }
/** /**
@ -23,7 +23,7 @@ class JUnitXmlTestsListener(val outputDir: String) extends TestsListener {
<properties> <properties>
{ {
val iter = System.getProperties.entrySet.iterator val iter = System.getProperties.entrySet.iterator
val props: ListBuffer[Node] = new ListBuffer() val props:ListBuffer[XNode] = new ListBuffer()
while (iter.hasNext) { while (iter.hasNext) {
val next = iter.next val next = iter.next
props += <property name={ next.getKey.toString } value={ next.getValue.toString }/> props += <property name={ next.getKey.toString } value={ next.getValue.toString }/>