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

Move intransitive warning to update. Ref #2127

This commit is contained in:
Eugene Yokota 2015-12-30 13:41:31 -05:00 committed by Dale Wijnand
parent 22d12cf996
commit 17397249ae
2 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ivy/src/main/scala/sbt/CompatibilityWarning.scala Normal file
View File

@ -0,0 +1,25 @@
package sbt
private[sbt] object CompatibilityWarning {
def apply(module: IvySbt#Module, mavenStyle: Boolean, log: Logger): Unit = {
if (mavenStyle) {
processIntransitive(module, log)
}
}
def processIntransitive(module: IvySbt#Module, log: Logger): Unit = {
val directDependencies: Seq[ModuleID] = module.moduleSettings match {
case x: InlineConfiguration => x.dependencies
case x: InlineConfigurationWithExcludes => x.dependencies
case _ => Seq()
}
directDependencies foreach { m =>
if (!m.isTransitive) {
log.warn(
s"""Found intransitive dependency ($m), but maven does not support intransitive dependencies.
| Use exclusions instead so transitive dependencies will be correctly excluded in dependent projects.
""".stripMargin)
} else ()
}
}
}

20
librarymanagement/src/main/scala/sbt/internal/librarymanagement/MakePom.scala
View File

@ -238,31 +238,21 @@ class MakePom(val log: Logger) {
def makeDependency(dependency: DependencyDescriptor, includeTypes: Set[String]): NodeSeq = def makeDependency(dependency: DependencyDescriptor, includeTypes: Set[String]): NodeSeq =
makeDependency(dependency, includeTypes, Nil) makeDependency(dependency, includeTypes, Nil)
def makeDependency(dependency: DependencyDescriptor, includeTypes: Set[String], excludes: Seq[ExcludeRule]): NodeSeq = { def makeDependency(dependency: DependencyDescriptor, includeTypes: Set[String], excludes: Seq[ExcludeRule]): NodeSeq =
def warnIntransitve(): Unit = {
if (!dependency.isTransitive)
log.warn(
s"""Translating intransitive dependency (${dependency.getDependencyId}) into pom.xml, but maven does not support intransitive dependencies.
| Please use exclusions instead so transitive dependencies will be correctly excluded in dependent projects.
""".stripMargin
)
else ()
val artifacts = dependency.getAllDependencyArtifacts val artifacts = dependency.getAllDependencyArtifacts
val includeArtifacts = artifacts.filter(d => includeTypes(d.getType)) val includeArtifacts = artifacts.filter(d => includeTypes(d.getType))
if (artifacts.isEmpty) { if (artifacts.isEmpty) {
val configs = dependency.getModuleConfigurations val configs = dependency.getModuleConfigurations
if (!configs.forall(Set("sources", "docs"))) { if (configs.filterNot(Set("sources", "docs")).nonEmpty) {
warnIntransitve()
val (scope, optional) = getScopeAndOptional(dependency.getModuleConfigurations) val (scope, optional) = getScopeAndOptional(dependency.getModuleConfigurations)
makeDependencyElem(dependency, scope, optional, None, None, excludes) makeDependencyElem(dependency, scope, optional, None, None, excludes)
} else NodeSeq.Empty } else NodeSeq.Empty
} else if (includeArtifacts.isEmpty) { } else if (includeArtifacts.isEmpty)
NodeSeq.Empty NodeSeq.Empty
} else { else
warnIntransitve()
NodeSeq.fromSeq(artifacts.flatMap(a => makeDependencyElem(dependency, a, excludes))) NodeSeq.fromSeq(artifacts.flatMap(a => makeDependencyElem(dependency, a, excludes)))
} }
}
@deprecated("Use `makeDependencyElem` variant which takes excludes", "0.13.9") @deprecated("Use `makeDependencyElem` variant which takes excludes", "0.13.9")
def makeDependencyElem(dependency: DependencyDescriptor, artifact: DependencyArtifactDescriptor): Option[Elem] = def makeDependencyElem(dependency: DependencyDescriptor, artifact: DependencyArtifactDescriptor): Option[Elem] =