mirror of https://github.com/sbt/sbt.git
exclude should apply to any artifact type, not just jars. fixes #436
This commit is contained in:
parent
ddcf885fb9
commit
dfac015eb3
|
|
@ -95,7 +95,7 @@ private object IvyScala
|
||||||
* the given configurations. */
|
* the given configurations. */
|
||||||
private[sbt] def excludeRule(organization: String, name: String, configurationNames: Iterable[String]): ExcludeRule =
|
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])
|
val rule = new DefaultExcludeRule(artifact, ExactPatternMatcher.INSTANCE, emptyMap[AnyRef,AnyRef])
|
||||||
configurationNames.foreach(rule.addConfiguration)
|
configurationNames.foreach(rule.addConfiguration)
|
||||||
rule
|
rule
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
libraryDependencies += "org.vaadin" % "dontpush-addon-ozonelayer" % "0.4.6"
|
||||||
|
|
||||||
|
resolvers += "asdf" at "http://maven.vaadin.com/vaadin-addons"
|
||||||
|
|
@ -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"
|
||||||
|
|
@ -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(", "))
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
-> check
|
||||||
|
$ copy-file changes/build.sbt build.sbt
|
||||||
|
> reload
|
||||||
|
> check
|
||||||
Loading…
Reference in New Issue