cfmcgrady commented on code in PR #2197:
URL:
https://github.com/apache/incubator-celeborn/pull/2197#discussion_r1438907582
##########
project/CelebornBuild.scala:
##########
@@ -753,7 +753,13 @@ trait SparkClientProjects {
(assembly / assemblyMergeStrategy) := {
case m if m.toLowerCase(Locale.ROOT).endsWith("manifest.mf") =>
MergeStrategy.discard
- case "META-INF/LICENSE" | "META-INF/NOTICE" =>
MergeStrategy.preferProject
+ // the LicenseAndNoticeMergeStrategy always picks the license/notice
file from the current project
+ case m @ ("META-INF/LICENSE" | "META-INF/NOTICE") =>
CustomMergeStrategy("LicenseAndNoticeMergeStrategy") { conflicts =>
+ val entry = conflicts.head
Review Comment:
> I'm not sure if the `conflicts.head` always returns the current project
file(if provided)
no matter what the `conflicts.head` returns, the content of LICENSE/NOTICE
will always be read from the current project resource directory.
##########
project/CelebornBuild.scala:
##########
@@ -753,7 +753,13 @@ trait SparkClientProjects {
(assembly / assemblyMergeStrategy) := {
case m if m.toLowerCase(Locale.ROOT).endsWith("manifest.mf") =>
MergeStrategy.discard
- case "META-INF/LICENSE" | "META-INF/NOTICE" =>
MergeStrategy.preferProject
+ // the LicenseAndNoticeMergeStrategy always picks the license/notice
file from the current project
+ case m @ ("META-INF/LICENSE" | "META-INF/NOTICE") =>
CustomMergeStrategy("LicenseAndNoticeMergeStrategy") { conflicts =>
+ val entry = conflicts.head
Review Comment:
> I'm not sure if the `conflicts.head` always returns the current project
file(if provided)
no matter what the `conflicts.head` returns, the content of LICENSE/NOTICE
will always be read from the current project resource directory.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
