Update DSS with linkis version 0.9.4 and solves some compilation errors

#Fixes #168
WeBankFinTech · Jun 22, 2020 · 53db7a9 · 53db7a9
1 parent 223856f
commit 53db7a9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/docs/en_US/ch1/DataSphereStudio_Compile_Manual.md b/docs/en_US/ch1/DataSphereStudio_Compile_Manual.md
@@ -7,7 +7,7 @@
 ```xml
   <properties>
           <dss.version>0.8.0</dss.version>
-          <linkis.version>0.9.3</linkis.version>
+          <linkis.version>0.9.4</linkis.version>
           <scala.version>2.11.8</scala.version>
           <jdk.compile.version>1.8</jdk.compile.version>
           <maven.version>3.3.3</maven.version>

diff --git a/docs/en_US/ch2/DSS Quick Installation Guide.md b/docs/en_US/ch2/DSS Quick Installation Guide.md
@@ -17,7 +17,7 @@ DSS also implements the integration of many external systems, such as [Qualitis]
 DSS environment configuration can be divided into three steps, including basic software installation, backend environment configuration, and frontend environment configuration. The details are as below:
 
 ### 2.1 Frontend and backend basic software installation
-Linkis standard version (above 0.9.3). How to install [Linkis](https://github.com/WeBankFinTech/Linkis/blob/master/docs/en_US/ch1/deploy.md)
+Linkis standard version (above 0.9.4). How to install [Linkis](https://github.com/WeBankFinTech/Linkis/blob/master/docs/en_US/ch1/deploy.md)
 
 JDK (above 1.8.0_141). How to install [JDK](https://www.runoob.com/java/java-environment-setup.html)
 
@@ -111,7 +111,7 @@ The environment is ready, click me to enter ****[4. Installation and use](https:
 ## Three Standard DSS environment configuration preparation
 The standard DSS environment preparation is also divided into three parts, the frontEnd-end and back-end basic software installation, back-end environment preparation, and frontEnd-end environment preparation. The details are as follows:
 ### 3.1 frontEnd and BackEnd basic software installation
-Linkis standard version (above 0.9.3), [How to install Linkis](https://github.com/WeBankFinTech/Linkis/blob/master/docs/en_US/ch1/deploy.md)
+Linkis standard version (above 0.9.4), [How to install Linkis](https://github.com/WeBankFinTech/Linkis/blob/master/docs/en_US/ch1/deploy.md)
 
 JDK (above 1.8.0_141), How to install [JDK](https://www.runoob.com/java/java-environment-setup.html)
 

diff --git a/docs/zh_CN/ch1/DSS编译文档.md b/docs/zh_CN/ch1/DSS编译文档.md
@@ -7,7 +7,7 @@
 ```xml
   <properties>
           <dss.version>0.8.0</dss.version>
-          <linkis.version>0.9.3</linkis.version>
+          <linkis.version>0.9.4</linkis.version>
           <scala.version>2.11.8</scala.version>
           <jdk.compile.version>1.8</jdk.compile.version>
           <maven.version>3.3.3</maven.version>

diff --git a/docs/zh_CN/ch2/DSS快速安装使用文档.md b/docs/zh_CN/ch2/DSS快速安装使用文档.md
@@ -32,7 +32,7 @@
 ## 二、精简版DSS环境配置准备
 DSS环境配置准备分为三部分，前后端基础软件安装、后端环境配置准备和前端环配置境准备，详细介绍如下：
 ### 2.1 前后端基础软件安装
-Linkis精简版(0.9.3及以上)，[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)
+Linkis精简版(0.9.4及以上)，[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)
 
 JDK (1.8.0_141以上)，[如何安装JDK](https://www.runoob.com/java/java-environment-setup.html) 
 
@@ -143,7 +143,7 @@ dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/
 ## 三、简单版DSS环境配置准备
 DSS环境配置准备分为三部分，前后端基础软件安装、后端环境配置准备和前端环配置境准备，详细介绍如下：
 ### 3.1 前后端基础软件安装
-Linkis简单版(0.9.3及以上)，[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)
+Linkis简单版(0.9.4及以上)，[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)
 
 JDK (1.8.0_141以上)，[如何安装JDK](https://www.runoob.com/java/java-environment-setup.html) 
 
@@ -251,7 +251,7 @@ dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/
 ## 四、标准版DSS环境配置准备
 标准版DSS环境准备也分为三部分，前后端基础软件安装、后端环境准备和前端环境准备，详细介绍如下：
 ### 4.1 前后端基础软件安装
-Linkis标准版(0.9.3及以上)，[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)
+Linkis标准版(0.9.4及以上)，[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)
 
 JDK (1.8.0_141以上)，[如何安装JDK](https://www.runoob.com/java/java-environment-setup.html)
 

diff --git a/dss-linkis-node-execution/pom.xml b/dss-linkis-node-execution/pom.xml
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>com.webank.wedatasphere.linkis</groupId>
             <artifactId>linkis-ujes-client</artifactId>
-            <version>0.9.3</version>
+            <version>${linkis.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.wedatasphere.linkis</groupId>
             <artifactId>linkis-workspace-httpclient</artifactId>
-            <version>0.9.3</version>
+            <version>${linkis.version}</version>
         </dependency>
 
 

diff --git a/dss-server/pom.xml b/dss-server/pom.xml
@@ -117,7 +117,7 @@
                 </exclusion>
             </exclusions>
             <groupId>com.webank.wedatasphere.linkis</groupId>
-            <version>0.9.3</version>
+            <version>${linkis.version}</version>
         </dependency>
 
         <dependency>