diff --git a/ivy/IvyScala.scala b/ivy/IvyScala.scala index a4654eb51..171f5488e 100644 --- a/ivy/IvyScala.scala +++ b/ivy/IvyScala.scala @@ -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 diff --git a/sbt/src/sbt-test/dependency-management/exclude-bundle/build.sbt b/sbt/src/sbt-test/dependency-management/exclude-bundle/build.sbt new file mode 100644 index 000000000..2652a7fd6 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/exclude-bundle/build.sbt @@ -0,0 +1,3 @@ +libraryDependencies += "org.vaadin" % "dontpush-addon-ozonelayer" % "0.4.6" + +resolvers += "asdf" at "http://maven.vaadin.com/vaadin-addons" diff --git a/sbt/src/sbt-test/dependency-management/exclude-bundle/changes/build.sbt b/sbt/src/sbt-test/dependency-management/exclude-bundle/changes/build.sbt new file mode 100644 index 000000000..fec4bc3f6 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/exclude-bundle/changes/build.sbt @@ -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" diff --git a/sbt/src/sbt-test/dependency-management/exclude-bundle/check.sbt b/sbt/src/sbt-test/dependency-management/exclude-bundle/check.sbt new file mode 100644 index 000000000..a2f89121e --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/exclude-bundle/check.sbt @@ -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(", ")) +} diff --git a/sbt/src/sbt-test/dependency-management/exclude-bundle/test b/sbt/src/sbt-test/dependency-management/exclude-bundle/test new file mode 100644 index 000000000..b99d27411 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/exclude-bundle/test @@ -0,0 +1,4 @@ +-> check +$ copy-file changes/build.sbt build.sbt +> reload +> check