Update DSS with linkis version 0.9.4 and solves some compilation errors

liuyou2 · liuyou2 · commit 5b6972195fcf · 2020-06-22T14:47:54.000+08:00
#Fixes #168
diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/conf/config.sh b/conf/config.sh
@@ -77,4 +77,4 @@ AZKABAN_ADRESS_PORT=8081
 QUALITIS_ADRESS_IP=127.0.0.1
 QUALITIS_ADRESS_PORT=8090
 
-DSS_VERSION=0.7.0
+DSS_VERSION=0.8.0
diff --git a/datachecker-appjoint/pom.xml b/datachecker-appjoint/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/docs/en_US/ch1/DataSphereStudio_Compile_Manual.md b/docs/en_US/ch1/DataSphereStudio_Compile_Manual.md
@@ -6,7 +6,7 @@
    
 ```xml
   <properties>
-          <dss.version>0.7.0</dss.version>
+          <dss.version>0.8.0</dss.version>
           <linkis.version>0.9.3</linkis.version>
           <scala.version>2.11.8</scala.version>
           <jdk.compile.version>1.8</jdk.compile.version>
diff --git a/docs/en_US/ch2/Azkaban_LinkisJobType_Deployment_Manual.md b/docs/en_US/ch2/Azkaban_LinkisJobType_Deployment_Manual.md
@@ -2,7 +2,7 @@
 
 
 ## 1. Ready work
-1.Click [release](https://github.com/WeBankFinTech/DataSphereStudio/releases/download/0.7.0/linkis-jobtype-0.7.0.zip) to select the corresponding installation package to download:
+1.Click [release](https://github.com/WeBankFinTech/DataSphereStudio/releases/download/0.8.0/linkis-jobtype-0.8.0.zip) to select the corresponding installation package to download:
 
 - linkis-jobtype-$version.zip
 
diff --git a/docs/zh_CN/ch1/DSS编译文档.md b/docs/zh_CN/ch1/DSS编译文档.md
@@ -6,7 +6,7 @@
    
 ```xml
   <properties>
-          <dss.version>0.7.0</dss.version>
+          <dss.version>0.8.0</dss.version>
           <linkis.version>0.9.3</linkis.version>
           <scala.version>2.11.8</scala.version>
           <jdk.compile.version>1.8</jdk.compile.version>
diff --git a/dss-appjoint-auth/pom.xml b/dss-appjoint-auth/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -38,6 +38,11 @@
             <artifactId>linkis-common</artifactId>
             <version>${linkis.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/dss-appjoint-auth/src/main/scala/com/webank/wedatasphere/dss/appjoint/auth/impl/AppJointAuthImpl.scala b/dss-appjoint-auth/src/main/scala/com/webank/wedatasphere/dss/appjoint/auth/impl/AppJointAuthImpl.scala
@@ -24,8 +24,9 @@ import com.webank.wedatasphere.dss.appjoint.auth.{AppJointAuth, RedirectMsg}
 import com.webank.wedatasphere.linkis.common.utils.Logging
 import com.webank.wedatasphere.linkis.httpclient.dws.DWSHttpClient
 import com.webank.wedatasphere.linkis.httpclient.dws.config.DWSClientConfigBuilder
-import javax.servlet.http.{Cookie, HttpServletRequest}
+import javax.servlet.http.HttpServletRequest
 import org.apache.commons.io.IOUtils
+import org.apache.http.impl.cookie.BasicClientCookie
 
 import scala.collection.JavaConversions._
 
@@ -68,7 +69,7 @@ class AppJointAuthImpl private() extends AppJointAuth with Logging {
       val index = cookie.indexOf("=")
       val key = cookie.substring(0, index).trim
       val value = cookie.substring(index + 1).trim
-      userInfoAction.addCookie(new Cookie(key, value))
+      userInfoAction.addCookie(new BasicClientCookie(key, value))
     }
     val redirectMsg = new RedirectMsgImpl
     redirectMsg.setRedirectUrl(request.getParameter(AppJointAuthImpl.REDIRECT_KEY))
diff --git a/dss-appjoint-core/pom.xml b/dss-appjoint-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -50,6 +50,12 @@
             <artifactId>dss-common</artifactId>
             <version>${dss.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.webank.wedatasphere.linkis</groupId>
+            <artifactId>linkis-httpclient</artifactId>
+            <version>${linkis.version}</version>
+        </dependency>
     </dependencies>
 
 
diff --git a/dss-appjoint-loader/pom.xml b/dss-appjoint-loader/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dss-appjoint-loader</artifactId>
-    <version>0.7.0</version>
+    <version>0.8.0</version>
 
     <dependencies>
         <dependency>
diff --git a/dss-application/pom.xml b/dss-application/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <artifactId>dss-application</artifactId>
 
diff --git a/dss-azkaban-scheduler-appjoint/pom.xml b/dss-azkaban-scheduler-appjoint/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-common/pom.xml b/dss-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <artifactId>dss-common</artifactId>
 
diff --git a/dss-flow-execution-entrance/pom.xml b/dss-flow-execution-entrance/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-linkis-node-execution/pom.xml b/dss-linkis-node-execution/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     
     <artifactId>dss-linkis-node-execution</artifactId>
diff --git a/dss-scheduler-appjoint-core/pom.xml b/dss-scheduler-appjoint-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-server/pom.xml b/dss-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -145,7 +145,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-scheduler-appjoint-core</artifactId>
-            <version>0.7.0</version>
+            <version>0.8.0</version>
         </dependency>
     </dependencies>
 
diff --git a/dss-server/src/main/assembly/distribution.xml b/dss-server/src/main/assembly/distribution.xml
@@ -82,7 +82,6 @@
                 <exclude>com.netflix.ribbon:ribbon-loadbalancer:jar</exclude>
                 <exclude>com.netflix.ribbon:ribbon-transport:jar</exclude>
                 <exclude>com.netflix.servo:servo-core:jar</exclude>
-                <exclude>com.ning:async-http-client:jar</exclude>
                 <exclude>com.sun.jersey.contribs:jersey-apache-client4:jar</exclude>
                 <exclude>com.sun.jersey:jersey-client:jar</exclude>
                 <exclude>com.sun.jersey:jersey-core:jar</exclude>
@@ -137,8 +136,6 @@
                 <exclude>joda-time:joda-time:jar</exclude>
                 <exclude>log4j:log4j:jar</exclude>
                 <exclude>mysql:mysql-connector-java:jar</exclude>
-                <exclude>net.databinder.dispatch:dispatch-core_2.11:jar</exclude>
-                <exclude>net.databinder.dispatch:dispatch-json4s-jackson_2.11:jar</exclude>
                 <exclude>org.antlr:antlr-runtime:jar</exclude>
                 <exclude>org.antlr:stringtemplate:jar</exclude>
                 <exclude>org.apache.commons:commons-compress:jar</exclude>
diff --git a/eventchecker-appjoint/pom.xml b/eventchecker-appjoint/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/plugins/azkaban/linkis-jobtype/pom.xml b/plugins/azkaban/linkis-jobtype/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <groupId>com.webank.wedatasphere.dss</groupId>
     <artifactId>linkis-jobtype</artifactId>
diff --git a/plugins/linkis/linkis-appjoint-entrance/pom.xml b/plugins/linkis/linkis-appjoint-entrance/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <packaging>pom</packaging>
     <groupId>com.webank.wedatasphere.dss</groupId>
     <artifactId>dss</artifactId>
-    <version>0.7.0</version>
+    <version>0.8.0</version>
 
     <modules>
         <module>dss-common</module>
@@ -47,7 +47,7 @@
     </modules>
 
     <properties>
-        <dss.version>0.7.0</dss.version>
+        <dss.version>0.8.0</dss.version>
         <linkis.version>0.9.4</linkis.version>
         <scala.version>2.11.8</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>
diff --git a/qualitis-appjoint/appjoint/pom.xml b/qualitis-appjoint/appjoint/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sendemail-appjoint/sendemail-core/pom.xml b/sendemail-appjoint/sendemail-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/visualis-appjoint/appjoint/pom.xml b/visualis-appjoint/appjoint/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -52,6 +52,12 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/net.databinder.dispatch/dispatch-core -->
+        <dependency>
+            <groupId>net.databinder.dispatch</groupId>
+            <artifactId>dispatch-core_2.11</artifactId>
+            <version>0.12.3</version>
+        </dependency>
 
     </dependencies>
 
