Merge pull request #292 from peacewong/master
to remove the useless dependencies and modify the suffix of the shell script to .sh
diff --git a/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/util/WorkspaceUtil.java b/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/util/WorkspaceUtil.java
index 48e4877..6cc7078 100644
--- a/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/util/WorkspaceUtil.java
+++ b/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/util/WorkspaceUtil.java
@@ -54,7 +54,7 @@
|| 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
index c58ab8d..d09c4aa 100644
--- a/ujes/definedEngines/shell/engine/pom.xml
+++ b/ujes/definedEngines/shell/engine/pom.xml
@@ -42,18 +42,9 @@
</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
index 6f6a06a..2eb9aaa 100644
--- 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
index 51b5061..435d2a9 100644
--- 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>
