Merge pull request #292 from peacewong/master

to remove the useless dependencies and modify the suffix of the shell script to .sh
apache · Feb 11, 2020 · 2c52100 · 2c52100
2 parents 66f1c15 + 2446123
commit 2c52100
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/...workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/util/WorkspaceUtil.java b/...workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/util/WorkspaceUtil.java
@@ -54,7 +54,7 @@ public static String getOpenFileTypeByFileName(String path) throws WorkSpaceExce
                 || path.endsWith(".py")
                 || path.endsWith(".mlsql")
                 || path.endsWith(".jdbc")
-                || path.endsWith(".shell")
+                || path.endsWith(".sh")
         ) {
             return "script";
         } else if (path.endsWith(".dolphin")) {

diff --git a/ujes/definedEngines/shell/engine/pom.xml b/ujes/definedEngines/shell/engine/pom.xml
@@ -40,20 +40,11 @@
             <artifactId>linkis-ujes-engine</artifactId>
             <version>${linkis.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.webank.wedatasphere.linkis</groupId>
-            <artifactId>linkis-common</artifactId>
-            <version>${linkis.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-feign</artifactId>
-            <version>${spring.eureka.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.linkis</groupId>
             <artifactId>linkis-cloudRPC</artifactId>
             <version>${linkis.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.linkis</groupId>

diff --git a/ujes/definedEngines/shell/enginemanager/pom.xml b/ujes/definedEngines/shell/enginemanager/pom.xml
@@ -38,6 +38,12 @@
             <artifactId>linkis-shell-engine</artifactId>
             <version>${linkis.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.webank.wedatasphere.linkis</groupId>
+            <artifactId>linkis-cloudRPC</artifactId>
+            <version>${linkis.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/ujes/definedEngines/shell/enginemanager/src/main/assembly/distribution.xml b/ujes/definedEngines/shell/enginemanager/src/main/assembly/distribution.xml
@@ -34,10 +34,6 @@
             <unpack>false</unpack>
             <useStrictFiltering>true</useStrictFiltering>
             <useTransitiveFiltering>true</useTransitiveFiltering>
-        <excludes>
-            <exclude>org.apache.httpcomponents:httpclient:jar</exclude>
-            <exclude>org.apache.httpcomponents:httpcore:jar</exclude>
-        </excludes>
         </dependencySet>
     </dependencySets>