diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 15b8dad3e..bed43f59e 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -1692,6 +1692,7 @@ object Classpaths { packagedArtifact in makePom := ((artifact in makePom).value -> makePom.value), deliver := deliverTask(makeIvyXmlConfiguration).value, deliverLocal := deliverTask(makeIvyXmlLocalConfiguration).value, + makeIvyXml := deliverTask(makeIvyXmlConfiguration).value, publish := publishTask(publishConfiguration, deliver).value, publishLocal := publishTask(publishLocalConfiguration, deliverLocal).value, publishM2 := publishTask(publishM2Configuration, deliverLocal).value diff --git a/main/src/main/scala/sbt/Keys.scala b/main/src/main/scala/sbt/Keys.scala index 35a40e72a..07d6d4d92 100644 --- a/main/src/main/scala/sbt/Keys.scala +++ b/main/src/main/scala/sbt/Keys.scala @@ -372,6 +372,8 @@ object Keys { val makePom = taskKey[File]("Generates a pom for publishing when publishing Maven-style.").withRank(BPlusTask) val deliver = taskKey[File]("Generates the Ivy file for publishing to a repository.").withRank(BTask) val deliverLocal = taskKey[File]("Generates the Ivy file for publishing to the local repository.").withRank(BTask) + // makeIvyXml is currently identical to the confusingly-named "deliver", which may be deprecated in the future + val makeIvyXml = taskKey[File]("Generates the Ivy file for publishing to a repository.").withRank(BTask) val publish = taskKey[Unit]("Publishes artifacts to a repository.").withRank(APlusTask) val publishLocal = taskKey[Unit]("Publishes artifacts to the local Ivy repository.").withRank(APlusTask) val publishM2 = taskKey[Unit]("Publishes artifacts to the local Maven repository.").withRank(ATask)