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

exclude should apply to any artifact type, not just jars. fixes #436

This commit is contained in:
Mark Harrah 2012-04-28 18:58:38 -04:00
parent ddcf885fb9
commit dfac015eb3
5 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/IvyScala.scala
View File

@ -95,7 +95,7 @@ private object IvyScala
* the given configurations. */
private[sbt] def excludeRule(organization: String, name: String, configurationNames: Iterable[String]): ExcludeRule =
{
val artifact = new ArtifactId(ModuleId.newInstance(organization, name), "*", "jar", "*")
val artifact = new ArtifactId(ModuleId.newInstance(organization, name), "*", "*", "*")
val rule = new DefaultExcludeRule(artifact, ExactPatternMatcher.INSTANCE, emptyMap[AnyRef,AnyRef])
configurationNames.foreach(rule.addConfiguration)
rule

3
sbt/src/sbt-test/dependency-management/exclude-bundle/build.sbt Normal file
View File

@ -0,0 +1,3 @@
libraryDependencies += "org.vaadin" % "dontpush-addon-ozonelayer" % "0.4.6"
resolvers += "asdf" at "http://maven.vaadin.com/vaadin-addons"

3
sbt/src/sbt-test/dependency-management/exclude-bundle/changes/build.sbt Normal file
View File

@ -0,0 +1,3 @@
libraryDependencies += "org.vaadin" % "dontpush-addon-ozonelayer" % "0.4.6" exclude("org.atmosphere", "atmosphere-compat-jetty")
resolvers += "asdf" at "http://maven.vaadin.com/vaadin-addons"

4
sbt/src/sbt-test/dependency-management/exclude-bundle/check.sbt Normal file
View File

@ -0,0 +1,4 @@
TaskKey[Unit]("check") <<= update map { report =>
val compatJetty = report.allModules.filter(mod => mod.name == "atmosphere-compat-jetty")
assert(compatJetty.isEmpty, "Expected dependencies to be excluded: " + compatJetty.mkString(", "))
}

4
sbt/src/sbt-test/dependency-management/exclude-bundle/test Normal file
View File

@ -0,0 +1,4 @@
-> check
$ copy-file changes/build.sbt build.sbt
> reload
> check