Merge pull request #1367 from dansanduleac/issue/1366

Don't update classifiers of projectDependencies

main/src/main/scala/sbt/Defaults.scala

@@ -1090,7 +1090,13 @@ object Classpaths {
     updateCacheName := "update_cache" + (if (crossPaths.value) s"_${scalaBinaryVersion.value}" else ""),
     update <<= updateTask tag (Tags.Update, Tags.Network),
     update := { val report = update.value; ConflictWarning(conflictWarning.value, report, streams.value.log); report },
-    classifiersModule in updateClassifiers := GetClassifiersModule(projectID.value, update.value.allModules, ivyConfigurations.in(updateClassifiers).value, transitiveClassifiers.in(updateClassifiers).value),
+    classifiersModule in updateClassifiers := {
+      import language.implicitConversions
+      implicit val key = (m: ModuleID) => (m.organization, m.name, m.revision)
+      val projectDeps = projectDependencies.value.iterator.map(key).toSet
+      val externalModules = update.value.allModules.filterNot(m => projectDeps contains key(m))
+      GetClassifiersModule(projectID.value, externalModules, ivyConfigurations.in(updateClassifiers).value, transitiveClassifiers.in(updateClassifiers).value)
+    },
     updateClassifiers <<= (ivySbt, classifiersModule in updateClassifiers, updateConfiguration, ivyScala, appConfiguration, streams) map { (is, mod, c, ivyScala, app, s) =>
       val out = is.withIvy(s.log)(_.getSettings.getDefaultIvyUserDir)
       withExcludes(out, mod.classifiers, lock(app)) { excludes =>

sbt/src/sbt-test/project/update-classifiers/build.sbt

@@ -0,0 +1,2 @@
+lazy val a = project in file(".") dependsOn(b)
+lazy val b = project

sbt/src/sbt-test/project/update-classifiers/test

@@ -0,0 +1,3 @@
+# Should succeed, and not attempt to get classifiers for b (which is a dep of
+# a)
+> a/updateClassifiers