fix maven-shade-plugin relocation cannot handle folder name with dot (#…

…1737)
pingcap · Nov 4, 2020 · 8ed90ed · 8ed90ed
1 parent ad7e6ee
commit 8ed90ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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}")