From 8ed90eddf872734950321728a966e5bf7a9d5ad3 Mon Sep 17 00:00:00 2001
From: Liangliang Gu <marsishandsome@gmail.com>
Date: Wed, 4 Nov 2020 13:23:38 +0800
Subject: [PATCH] fix maven-shade-plugin relocation cannot handle folder name
 with dot (#1737)

---
 assembly/src/main/assembly/assembly.xml                       | 4 ++--
 .../main/scala/com/pingcap/tispark/utils/ReflectionUtil.scala | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/assembly/src/main/assembly/assembly.xml b/assembly/src/main/assembly/assembly.xml
index 57337e7fbf..c56f0b46e6 100644
--- a/assembly/src/main/assembly/assembly.xml
+++ b/assembly/src/main/assembly/assembly.xml
@@ -23,7 +23,7 @@
             <directory>
                 ${project.parent.basedir}/spark-wrapper/spark-2.3/target/classes/
             </directory>
-            <outputDirectory>resources/spark-wrapper-spark-2.3</outputDirectory>
+            <outputDirectory>resources/spark-wrapper-spark-2_3</outputDirectory>
             <includes>
                 <include>**/*</include>
             </includes>
@@ -32,7 +32,7 @@
             <directory>
                 ${project.parent.basedir}/spark-wrapper/spark-2.4/target/classes/
             </directory>
-            <outputDirectory>resources/spark-wrapper-spark-2.4</outputDirectory>
+            <outputDirectory>resources/spark-wrapper-spark-2_4</outputDirectory>
             <includes>
                 <include>**/*</include>
             </includes>
diff --git a/core/src/main/scala/com/pingcap/tispark/utils/ReflectionUtil.scala b/core/src/main/scala/com/pingcap/tispark/utils/ReflectionUtil.scala
index 447073d7a1..d9eef95517 100644
--- a/core/src/main/scala/com/pingcap/tispark/utils/ReflectionUtil.scala
+++ b/core/src/main/scala/com/pingcap/tispark/utils/ReflectionUtil.scala
@@ -64,7 +64,8 @@ object ReflectionUtil {
       classDir.toURI.toURL
     } else {
       new URL(
-        s"jar:$tisparkClassUrl!/resources/spark-wrapper-spark-${TiSparkInfo.SPARK_MAJOR_VERSION}/")
+        s"jar:$tisparkClassUrl!/resources/spark-wrapper-spark-${TiSparkInfo.SPARK_MAJOR_VERSION
+          .replace('.', '_')}/")
     }
     logger.info(s"spark wrapper class url: ${sparkWrapperClassURL.toString}")