Repository: spark Updated Branches: refs/heads/master d762d110d -> c89b43118
[SPARK-22849] ivy.retrieve pattern should also consider `classifier` ## What changes were proposed in this pull request? In the previous PR https://github.com/apache/spark/pull/5755#discussion_r157848354, we dropped `(-[classifier])` from the retrieval pattern. We should add it back; otherwise, > If this pattern for instance doesn't has the [type] or [classifier] token, > Ivy will download the source/javadoc artifacts to the same file as the > regular jar. ## How was this patch tested? The existing tests Author: gatorsmile <gatorsm...@gmail.com> Closes #20037 from gatorsmile/addClassifier. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c89b4311 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c89b4311 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c89b4311 Branch: refs/heads/master Commit: c89b43118347677f122db190c9033394c15cee30 Parents: d762d11 Author: gatorsmile <gatorsm...@gmail.com> Authored: Wed Dec 20 11:19:57 2017 -0800 Committer: gatorsmile <gatorsm...@gmail.com> Committed: Wed Dec 20 11:19:57 2017 -0800 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/c89b4311/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala index ab834bb..cbe1f2c 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala @@ -1271,7 +1271,7 @@ private[spark] object SparkSubmitUtils { // retrieve all resolved dependencies ivy.retrieve(rr.getModuleDescriptor.getModuleRevisionId, packagesDirectory.getAbsolutePath + File.separator + - "[organization]_[artifact]-[revision].[ext]", + "[organization]_[artifact]-[revision](-[classifier]).[ext]", retrieveOptions.setConfs(Array(ivyConfName))) resolveDependencyPaths(rr.getArtifacts.toArray, packagesDirectory) } finally { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
