From cdba2dbc53fe385ee8246a0d5e20f61ce9d1e485 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 6 Jan 2020 21:25:57 -0500 Subject: [PATCH] Remove "merged artifact" error message Fixes https://github.com/sbt/sbt/issues/4520 It seems to display "Detected merged artifact" whenever the download fails, which is confusing. --- .../ivyint/ParallelResolveEngine.scala | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala index cac26e395..9af7ef6cb 100644 --- a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala +++ b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala @@ -8,7 +8,6 @@ import org.apache.ivy.core.module.descriptor.Artifact import org.apache.ivy.core.report._ import org.apache.ivy.core.resolve._ import org.apache.ivy.core.sort.SortEngine -import org.apache.ivy.util.Message import org.apache.ivy.util.filter.Filter import scala.concurrent.duration.Duration @@ -103,16 +102,6 @@ private[sbt] class ParallelResolveEngine( artifactReport.getDownloadStatus match { case DownloadStatus.SUCCESSFUL => size + artifactReport.getSize - case DownloadStatus.FAILED => - val artifact = artifactReport.getArtifact - val mergedAttribute = artifact.getExtraAttribute("ivy:merged") - if (mergedAttribute != null) { - Message.warn(s"\tMissing merged artifact: $artifact, required by $mergedAttribute.") - } else { - Message.warn(s"\tDetected merged artifact: $artifactReport.") - resolver.reportFailure(artifactReport.getArtifact) - } - size case _ => size } }