Merge pull request #105 from wolfboys/master

common jar path error,fixed
apache · Apr 16, 2021 · 2606b7c · 2606b7c
2 parents 6bf1dd5 + 75f0b40
commit 2606b7c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 23 deletions.
diff --git a/streamx-plugin/streamx-flink-sqlcli/pom.xml b/streamx-plugin/streamx-flink-sqlcli/pom.xml
@@ -11,28 +11,6 @@
     <name>StreamX : Flink SQL Cli</name>
 
     <dependencies>
-
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-            <version>${scala.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-compiler</artifactId>
-            <version>${scala.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-reflect</artifactId>
-            <version>${scala.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.beachape</groupId>
             <artifactId>enumeratum_${scala.binary.version}</artifactId>

diff --git a/...nk-submit/src/main/scala/com/streamxhub/streamx/flink/submit/trait/FlinkSubmitTrait.scala b/...nk-submit/src/main/scala/com/streamxhub/streamx/flink/submit/trait/FlinkSubmitTrait.scala
@@ -20,6 +20,7 @@
  */
 package com.streamxhub.streamx.flink.submit.`trait`
 
+import com.streamxhub.streamx.common.conf.ConfigConst
 import com.streamxhub.streamx.common.conf.ConfigConst._
 import com.streamxhub.streamx.common.util.{HdfsUtils, Logger, Utils}
 import com.streamxhub.streamx.flink.common.conf.FlinkRunOption
@@ -66,7 +67,7 @@ trait FlinkSubmitTrait extends Logger {
       flinkHdfsHome,
       flinkHdfsLibs = new Path(s"$flinkHdfsHome/lib"),
       flinkHdfsPlugins = new Path(s"$flinkHdfsHome/plugins"),
-      flinkHdfsJars = new Path(s"$flinkHdfsHome/jars"),
+      flinkHdfsJars = new Path(APP_JARS),
       streamxPlugin = new Path(s"${HdfsUtils.getDefaultFS}$APP_PLUGINS"),
       flinkYaml = HdfsUtils.read(s"$flinkHdfsHome/conf/flink-conf.yaml"),
       flinkHdfsDistJar = new File(s"$FLINK_HOME/lib").list().filter(_.matches("flink-dist_.*\\.jar")) match {