diff --git a/assembly/pom.xml b/assembly/pom.xml
index 29934071c0..8a81a449df 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
4.0.0
diff --git a/conf/config.sh b/conf/config.sh
index dea8a60d7b..7fc8e9e4e7 100644
--- 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
index c2d804486c..706f88359f 100644
--- a/datachecker-appjoint/pom.xml
+++ b/datachecker-appjoint/pom.xml
@@ -22,7 +22,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
4.0.0
diff --git a/docs/en_US/ch1/DataSphereStudio_Compile_Manual.md b/docs/en_US/ch1/DataSphereStudio_Compile_Manual.md
index 6a24df612d..46b95c4067 100644
--- a/docs/en_US/ch1/DataSphereStudio_Compile_Manual.md
+++ b/docs/en_US/ch1/DataSphereStudio_Compile_Manual.md
@@ -6,8 +6,8 @@
```xml
- 0.7.0
- 0.9.3
+ 0.8.0
+ 0.9.4
2.11.8
1.8
3.3.3
diff --git a/docs/en_US/ch2/Azkaban_LinkisJobType_Deployment_Manual.md b/docs/en_US/ch2/Azkaban_LinkisJobType_Deployment_Manual.md
index d70a87eedc..33cb3808cb 100644
--- 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/en_US/ch2/DSS Quick Installation Guide.md b/docs/en_US/ch2/DSS Quick Installation Guide.md
index f4b8cd1595..a7e7a5a5ff 100644
--- 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\347\274\226\350\257\221\346\226\207\346\241\243.md" "b/docs/zh_CN/ch1/DSS\347\274\226\350\257\221\346\226\207\346\241\243.md"
index 0b4d82f0b8..fe0b0b0002 100644
--- "a/docs/zh_CN/ch1/DSS\347\274\226\350\257\221\346\226\207\346\241\243.md"
+++ "b/docs/zh_CN/ch1/DSS\347\274\226\350\257\221\346\226\207\346\241\243.md"
@@ -6,8 +6,8 @@
```xml
- 0.7.0
- 0.9.3
+ 0.8.0
+ 0.9.4
2.11.8
1.8
3.3.3
diff --git "a/docs/zh_CN/ch2/DSS\345\277\253\351\200\237\345\256\211\350\243\205\344\275\277\347\224\250\346\226\207\346\241\243.md" "b/docs/zh_CN/ch2/DSS\345\277\253\351\200\237\345\256\211\350\243\205\344\275\277\347\224\250\346\226\207\346\241\243.md"
index e775e8380e..2b9035504d 100644
--- "a/docs/zh_CN/ch2/DSS\345\277\253\351\200\237\345\256\211\350\243\205\344\275\277\347\224\250\346\226\207\346\241\243.md"
+++ "b/docs/zh_CN/ch2/DSS\345\277\253\351\200\237\345\256\211\350\243\205\344\275\277\347\224\250\346\226\207\346\241\243.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-appjoint-auth/pom.xml b/dss-appjoint-auth/pom.xml
index 595ad36f0b..fc09399d04 100644
--- a/dss-appjoint-auth/pom.xml
+++ b/dss-appjoint-auth/pom.xml
@@ -22,7 +22,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
4.0.0
@@ -38,6 +38,11 @@
linkis-common
${linkis.version}
+
+ javax.servlet
+ javax.servlet-api
+ 3.1.0
+
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
index 7413baf5f6..15dd7e3072 100644
--- 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
index 0c00f2cd7f..b27a98f70e 100644
--- a/dss-appjoint-core/pom.xml
+++ b/dss-appjoint-core/pom.xml
@@ -22,7 +22,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
4.0.0
@@ -50,6 +50,12 @@
dss-common
${dss.version}
+
+
+ com.webank.wedatasphere.linkis
+ linkis-httpclient
+ ${linkis.version}
+
diff --git a/dss-appjoint-loader/pom.xml b/dss-appjoint-loader/pom.xml
index 7dc9097f34..3134933be6 100644
--- a/dss-appjoint-loader/pom.xml
+++ b/dss-appjoint-loader/pom.xml
@@ -22,12 +22,12 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
4.0.0
dss-appjoint-loader
- 0.7.0
+ 0.8.0
diff --git a/dss-application/pom.xml b/dss-application/pom.xml
index 1a55a80350..2c9fdc039b 100644
--- a/dss-application/pom.xml
+++ b/dss-application/pom.xml
@@ -23,7 +23,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
dss-application
diff --git a/dss-azkaban-scheduler-appjoint/pom.xml b/dss-azkaban-scheduler-appjoint/pom.xml
index a6d8945341..b9110cd5a7 100644
--- a/dss-azkaban-scheduler-appjoint/pom.xml
+++ b/dss-azkaban-scheduler-appjoint/pom.xml
@@ -22,7 +22,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
4.0.0
diff --git a/dss-common/pom.xml b/dss-common/pom.xml
index bbf896bfa5..7787005843 100644
--- a/dss-common/pom.xml
+++ b/dss-common/pom.xml
@@ -23,7 +23,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
dss-common
diff --git a/dss-flow-execution-entrance/pom.xml b/dss-flow-execution-entrance/pom.xml
index 97d12b24be..abeccba5c0 100644
--- a/dss-flow-execution-entrance/pom.xml
+++ b/dss-flow-execution-entrance/pom.xml
@@ -22,7 +22,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
4.0.0
diff --git a/dss-linkis-node-execution/pom.xml b/dss-linkis-node-execution/pom.xml
index b98c33987a..29fd8ae27a 100644
--- a/dss-linkis-node-execution/pom.xml
+++ b/dss-linkis-node-execution/pom.xml
@@ -24,7 +24,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
dss-linkis-node-execution
@@ -33,13 +33,13 @@
com.webank.wedatasphere.linkis
linkis-ujes-client
- 0.9.3
+ ${linkis.version}
com.webank.wedatasphere.linkis
linkis-workspace-httpclient
- 0.9.3
+ ${linkis.version}
diff --git a/dss-scheduler-appjoint-core/pom.xml b/dss-scheduler-appjoint-core/pom.xml
index b09213fc83..42a5bc856f 100644
--- a/dss-scheduler-appjoint-core/pom.xml
+++ b/dss-scheduler-appjoint-core/pom.xml
@@ -22,7 +22,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
4.0.0
diff --git a/dss-server/pom.xml b/dss-server/pom.xml
index b0627677bc..4408aa02df 100644
--- a/dss-server/pom.xml
+++ b/dss-server/pom.xml
@@ -22,7 +22,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
4.0.0
@@ -117,7 +117,7 @@
com.webank.wedatasphere.linkis
- 0.9.3
+ ${linkis.version}
@@ -145,7 +145,7 @@
com.webank.wedatasphere.dss
dss-scheduler-appjoint-core
- 0.7.0
+ 0.8.0
diff --git a/dss-server/src/main/assembly/distribution.xml b/dss-server/src/main/assembly/distribution.xml
index 560fc34e34..cba104e837 100644
--- a/dss-server/src/main/assembly/distribution.xml
+++ b/dss-server/src/main/assembly/distribution.xml
@@ -82,7 +82,6 @@
com.netflix.ribbon:ribbon-loadbalancer:jar
com.netflix.ribbon:ribbon-transport:jar
com.netflix.servo:servo-core:jar
- com.ning:async-http-client:jar
com.sun.jersey.contribs:jersey-apache-client4:jar
com.sun.jersey:jersey-client:jar
com.sun.jersey:jersey-core:jar
@@ -137,8 +136,6 @@
joda-time:joda-time:jar
log4j:log4j:jar
mysql:mysql-connector-java:jar
- net.databinder.dispatch:dispatch-core_2.11:jar
- net.databinder.dispatch:dispatch-json4s-jackson_2.11:jar
org.antlr:antlr-runtime:jar
org.antlr:stringtemplate:jar
org.apache.commons:commons-compress:jar
diff --git a/eventchecker-appjoint/pom.xml b/eventchecker-appjoint/pom.xml
index 8c38e47474..80243766f3 100644
--- a/eventchecker-appjoint/pom.xml
+++ b/eventchecker-appjoint/pom.xml
@@ -22,7 +22,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
4.0.0
diff --git a/plugins/azkaban/linkis-jobtype/pom.xml b/plugins/azkaban/linkis-jobtype/pom.xml
index 56225d510a..54497a7f30 100644
--- a/plugins/azkaban/linkis-jobtype/pom.xml
+++ b/plugins/azkaban/linkis-jobtype/pom.xml
@@ -23,7 +23,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
com.webank.wedatasphere.dss
linkis-jobtype
diff --git a/plugins/linkis/linkis-appjoint-entrance/pom.xml b/plugins/linkis/linkis-appjoint-entrance/pom.xml
index 0651c396ef..6e0d82a240 100644
--- a/plugins/linkis/linkis-appjoint-entrance/pom.xml
+++ b/plugins/linkis/linkis-appjoint-entrance/pom.xml
@@ -22,7 +22,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
4.0.0
diff --git a/pom.xml b/pom.xml
index ff14d65f7c..4040e500d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
pom
com.webank.wedatasphere.dss
dss
- 0.7.0
+ 0.8.0
dss-common
@@ -47,7 +47,7 @@
- 0.7.0
+ 0.8.0
0.9.4
2.11.8
1.8
diff --git a/qualitis-appjoint/appjoint/pom.xml b/qualitis-appjoint/appjoint/pom.xml
index d32ad4bb8a..5792638658 100644
--- a/qualitis-appjoint/appjoint/pom.xml
+++ b/qualitis-appjoint/appjoint/pom.xml
@@ -5,7 +5,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
4.0.0
diff --git a/sendemail-appjoint/sendemail-core/pom.xml b/sendemail-appjoint/sendemail-core/pom.xml
index 97c3c167dd..ebff3d1ea3 100644
--- a/sendemail-appjoint/sendemail-core/pom.xml
+++ b/sendemail-appjoint/sendemail-core/pom.xml
@@ -22,7 +22,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
4.0.0
diff --git a/visualis-appjoint/appjoint/pom.xml b/visualis-appjoint/appjoint/pom.xml
index ab48a6148b..afe7b4e616 100644
--- a/visualis-appjoint/appjoint/pom.xml
+++ b/visualis-appjoint/appjoint/pom.xml
@@ -22,7 +22,7 @@
dss
com.webank.wedatasphere.dss
- 0.7.0
+ 0.8.0
4.0.0
@@ -52,6 +52,12 @@
provided
true
+
+
+ net.databinder.dispatch
+ dispatch-core_2.11
+ 0.12.3
+