[SPARK-20156][SQL][ML][FOLLOW-UP] Java String toLowerCase with Locale.ROOT
## What changes were proposed in this pull request? Add `Locale.ROOT` to all internal calls to String `toLowerCase`, `toUpperCase` ## How was this patch tested? existing tests Closes #22975 from zhengruifeng/Tokenizer_Locale. Authored-by: zhengruifeng <ruifengz@foxmail.com> Signed-off-by: Sean Owen <sean.owen@databricks.com>
This commit is contained in:
parent
0558d021cc
commit
297b81e0eb
|
@ -17,6 +17,7 @@
|
|||
|
||||
import java.io._
|
||||
import java.nio.file.Files
|
||||
import java.util.Locale
|
||||
|
||||
import scala.io.Source
|
||||
import scala.util.Properties
|
||||
|
@ -650,10 +651,13 @@ object Assembly {
|
|||
},
|
||||
jarName in (Test, assembly) := s"${moduleName.value}-test-${version.value}.jar",
|
||||
mergeStrategy in assembly := {
|
||||
case m if m.toLowerCase.endsWith("manifest.mf") => MergeStrategy.discard
|
||||
case m if m.toLowerCase.matches("meta-inf.*\\.sf$") => MergeStrategy.discard
|
||||
case m if m.toLowerCase(Locale.ROOT).endsWith("manifest.mf")
|
||||
=> MergeStrategy.discard
|
||||
case m if m.toLowerCase(Locale.ROOT).matches("meta-inf.*\\.sf$")
|
||||
=> MergeStrategy.discard
|
||||
case "log4j.properties" => MergeStrategy.discard
|
||||
case m if m.toLowerCase.startsWith("meta-inf/services/") => MergeStrategy.filterDistinctLines
|
||||
case m if m.toLowerCase(Locale.ROOT).startsWith("meta-inf/services/")
|
||||
=> MergeStrategy.filterDistinctLines
|
||||
case "reference.conf" => MergeStrategy.concat
|
||||
case _ => MergeStrategy.first
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue