Update project/CelebornBuild.scala

apache · Nov 6, 2023 · 1ad6634 · 1ad6634
1 parent cd2db07
commit 1ad6634
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/project/CelebornBuild.scala b/project/CelebornBuild.scala
@@ -964,7 +964,7 @@ object MRClientProjects {
           case m if m.toLowerCase(Locale.ROOT).endsWith("manifest.mf") => MergeStrategy.discard
           // For netty-3.x.y.Final.jar
           case m if m.startsWith("META-INF/license/") => MergeStrategy.discard
-          case m if m == "META-INF/LICENSE" || m == "META-INF/NOTICE" => MergeStrategy.preferProject
+          case "META-INF/LICENSE" | "META-INF/NOTICE" => MergeStrategy.preferProject
           case PathList(ps@_*) if Assembly.isLicenseFile(ps.last) => MergeStrategy.discard
           // Drop all proto files that are not needed as artifacts of the build.
           case m if m.toLowerCase(Locale.ROOT).endsWith(".proto") => MergeStrategy.discard