Skip to content

Commit bc72f11

Browse files
committed
Adapt to Linkis spring version.
1 parent eb139c1 commit bc72f11

File tree

11 files changed

+71
-33
lines changed
  • dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core
  • dss-commons/dss-common
  • dss-framework
    • dss-framework-orchestrator-server
    • framework-plugins/dss-framework-orchestrator-publish
  • dss-orchestrator
    • dss-orchestrator-loader
    • orchestrators/dss-workflow
  • dss-server
  • dss-standard
    • sso-standard/spring-origin-sso-integration-plugin
    • structure-standard/spring-origin-dss-project-plugin

11 files changed

+71
-33
lines changed

dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@
131131
<dependency>
132132
<groupId>org.springframework</groupId>
133133
<artifactId>spring-context-support</artifactId>
134-
<version>${spring.version}</version>
134+
<version>${spring-framework.version}</version>
135135
</dependency>
136136
<dependency>
137137
<groupId>org.springframework</groupId>
138138
<artifactId>spring-aop</artifactId>
139-
<version>${spring.version}</version>
139+
<version>${spring-framework.version}</version>
140140
</dependency>
141141
<dependency>
142142
<groupId>javax.mail</groupId>

dss-commons/dss-common/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,17 +121,17 @@
121121
<dependency>
122122
<artifactId>spring-aop</artifactId>
123123
<groupId>org.springframework</groupId>
124-
<version>${spring.version}</version>
124+
<version>${spring-framework.version}</version>
125125
</dependency>
126126
<dependency>
127127
<artifactId>spring-context-support</artifactId>
128128
<groupId>org.springframework</groupId>
129-
<version>${spring.version}</version>
129+
<version>${spring-framework.version}</version>
130130
</dependency>
131131
<dependency>
132132
<artifactId>spring-webmvc</artifactId>
133133
<groupId>org.springframework</groupId>
134-
<version>${spring.version}</version>
134+
<version>${spring-framework.version}</version>
135135
</dependency>
136136
<dependency>
137137
<groupId>org.apache.linkis</groupId>

dss-framework/dss-framework-orchestrator-server/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@
6969
<dependency>
7070
<artifactId>spring-aop</artifactId>
7171
<groupId>org.springframework</groupId>
72-
<version>${spring.version}</version>
72+
<version>${spring-framework.version}</version>
7373
</dependency>
7474
<dependency>
7575
<artifactId>spring-context</artifactId>
7676
<groupId>org.springframework</groupId>
77-
<version>${spring.version}</version>
77+
<version>${spring-framework.version}</version>
7878
</dependency>
7979
<dependency>
8080
<groupId>org.apache.linkis</groupId>

dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<dependency>
5959
<groupId>org.springframework</groupId>
6060
<artifactId>spring-tx</artifactId>
61-
<version>${spring.version}</version>
61+
<version>${spring-framework.version}</version>
6262
<scope>provided</scope>
6363
</dependency>
6464
<dependency>
@@ -82,7 +82,7 @@
8282
<dependency>
8383
<groupId>org.springframework</groupId>
8484
<artifactId>spring-context</artifactId>
85-
<version>${spring.version}</version>
85+
<version>${spring-framework.version}</version>
8686
<scope>provided</scope>
8787
</dependency>
8888
<dependency>

dss-orchestrator/dss-orchestrator-loader/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>org.springframework</groupId>
6161
<artifactId>spring-context</artifactId>
62-
<version>${spring.version}</version>
62+
<version>${spring-framework.version}</version>
6363
<scope>provided</scope>
6464
</dependency>
6565
<dependency>

dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@
116116
<dependency>
117117
<artifactId>spring-tx</artifactId>
118118
<groupId>org.springframework</groupId>
119-
<version>${spring.version}</version>
119+
<version>${spring-framework.version}</version>
120120
</dependency>
121121
<dependency>
122122
<artifactId>spring-context-support</artifactId>
123123
<groupId>org.springframework</groupId>
124-
<version>${spring.version}</version>
124+
<version>${spring-framework.version}</version>
125125
</dependency>
126126
<dependency>
127127
<groupId>org.apache.linkis</groupId>

dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>org.springframework</groupId>
4545
<artifactId>spring-context</artifactId>
46-
<version>${spring.version}</version>
46+
<version>${spring-framework.version}</version>
4747
<scope>provided</scope>
4848
</dependency>
4949

dss-server/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,11 @@
7070
<artifactId>dss-framework-migrate-server</artifactId>
7171
<version>${dss.version}</version>
7272
</dependency>
73-
73+
<dependency>
74+
<groupId>com.webank.wedatasphere.dss</groupId>
75+
<artifactId>dss-scriptis-server</artifactId>
76+
<version>${dss.version}</version>
77+
</dependency>
7478

7579
</dependencies>
7680

dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@
4242
<dependency>
4343
<groupId>org.springframework</groupId>
4444
<artifactId>spring-core</artifactId>
45-
<version>${spring.version}</version>
45+
<version>${spring-framework.version}</version>
4646
<scope>compile</scope>
4747
</dependency>
4848
<dependency>
4949
<groupId>org.springframework</groupId>
5050
<artifactId>spring-context</artifactId>
51-
<version>${spring.version}</version>
51+
<version>${spring-framework.version}</version>
5252
<scope>compile</scope>
5353
</dependency>
5454
<dependency>
5555
<groupId>org.springframework</groupId>
5656
<artifactId>spring-web</artifactId>
57-
<version>${spring.version}</version>
57+
<version>${spring-framework.version}</version>
5858
<scope>compile</scope>
5959
</dependency>
6060
</dependencies>

dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@
3737
<dependency>
3838
<groupId>org.springframework</groupId>
3939
<artifactId>spring-core</artifactId>
40-
<version>${spring.version}</version>
40+
<version>${spring-framework.version}</version>
4141
<scope>compile</scope>
4242
</dependency>
4343
<dependency>
4444
<groupId>org.springframework</groupId>
4545
<artifactId>spring-context</artifactId>
46-
<version>${spring.version}</version>
46+
<version>${spring-framework.version}</version>
4747
<scope>compile</scope>
4848
</dependency>
4949
<dependency>
5050
<groupId>org.springframework</groupId>
5151
<artifactId>spring-web</artifactId>
52-
<version>${spring.version}</version>
52+
<version>${spring-framework.version}</version>
5353
<scope>compile</scope>
5454
</dependency>
5555
</dependencies>

0 commit comments

Comments
 (0)