Skip to content

Commit

Permalink
Update DSS with linkis version 0.9.4 and solves some compilation errors
Browse files Browse the repository at this point in the history
#Fixes #168
  • Loading branch information
liuyou2 committed Jun 22, 2020
1 parent 1fb288f commit 223856f
Show file tree
Hide file tree
Showing 25 changed files with 46 additions and 31 deletions.
2 changes: 1 addition & 1 deletion assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion conf/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion datachecker-appjoint/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion docs/en_US/ch1/DataSphereStudio_Compile_Manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion docs/en_US/ch2/Azkaban_LinkisJobType_Deployment_Manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/zh_CN/ch1/DSS编译文档.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 6 additions & 1 deletion dss-appjoint-auth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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._

Expand Down Expand Up @@ -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))
Expand Down
8 changes: 7 additions & 1 deletion dss-appjoint-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>


Expand Down
4 changes: 2 additions & 2 deletions dss-appjoint-loader/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion dss-application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion dss-azkaban-scheduler-appjoint/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion dss-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion dss-flow-execution-entrance/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion dss-linkis-node-execution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion dss-scheduler-appjoint-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions dss-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>

Expand Down
3 changes: 0 additions & 3 deletions dss-server/src/main/assembly/distribution.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion eventchecker-appjoint/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion plugins/azkaban/linkis-jobtype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion plugins/linkis/linkis-appjoint-entrance/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion qualitis-appjoint/appjoint/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion sendemail-appjoint/sendemail-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
8 changes: 7 additions & 1 deletion visualis-appjoint/appjoint/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>

Expand Down

0 comments on commit 223856f

Please sign in to comment.