Skip to content

Commit 05f2ed7

Browse files
committed
fix spring version
1 parent f52bd2e commit 05f2ed7

2 files changed

Lines changed: 30 additions & 5 deletions

File tree

pom.xml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646

4747
<properties>
4848
<revision>0.4.1-wedatasphere-SNAPSHOT</revision>
49-
<linkis.version>1.8.0-wds-SNAPSHOT</linkis.version>
49+
<linkis.version>1.12.0-wds</linkis.version>
5050
<junit.version>4.12</junit.version>
51-
<dss.version>1.5.0-SNAPSHOT</dss.version>
51+
<dss.version>1.12.0-SNAPSHOT</dss.version>
5252
<scala.version>2.11.12</scala.version>
5353
<jdk.compile.version>1.8</jdk.compile.version>
5454
<maven.version>3.3.3</maven.version>
@@ -59,10 +59,10 @@
5959
<httpmime.version>4.5.4</httpmime.version>
6060
<beanutils.version>1.9.4</beanutils.version>
6161
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
62-
<spring.version>5.2.12.RELEASE</spring.version>
62+
<spring-framework.version>5.3.34</spring-framework.version>
6363
<mybatis.spring.boot.version>2.1.2</mybatis.spring.boot.version>
64-
<spring.boot.version>2.3.7.RELEASE</spring.boot.version>
65-
<spring.cloud.version>2.2.6.RELEASE</spring.cloud.version>
64+
<spring.boot.version>2.7.12</spring.boot.version>
65+
<!--<spring.cloud.version>2.2.6.RELEASE</spring.cloud.version>-->
6666
<commons.math.version>3.1.1</commons.math.version>
6767
<commons.lang3.version>3.12.0</commons.lang3.version>
6868
<commons.lang.version>2.6</commons.lang.version>
@@ -147,6 +147,12 @@
147147
<version>${linkis.version}</version>
148148
</dependency>
149149

150+
<dependency>
151+
<groupId>org.springframework</groupId>
152+
<artifactId>spring-webmvc</artifactId>
153+
<version>${spring-framework.version}</version>
154+
</dependency>
155+
150156
<dependency>
151157
<groupId>com.google.code.gson</groupId>
152158
<artifactId>gson</artifactId>

streamis-jobmanager/streamis-jobmanager-server/pom.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,20 @@
3030
<dependency>
3131
<groupId>org.apache.linkis</groupId>
3232
<artifactId>linkis-module</artifactId>
33+
<exclusions>
34+
<exclusion>
35+
<artifactId>spring-beans</artifactId>
36+
<groupId>org.springframework</groupId>
37+
</exclusion>
38+
<exclusion>
39+
<artifactId>spring-web</artifactId>
40+
<groupId>org.springframework</groupId>
41+
</exclusion>
42+
<exclusion>
43+
<artifactId>spring-webmvc</artifactId>
44+
<groupId>org.springframework</groupId>
45+
</exclusion>
46+
</exclusions>
3347
</dependency>
3448
<dependency>
3549
<groupId>com.webank.wedatasphere.streamis</groupId>
@@ -87,6 +101,11 @@
87101
<!-- <version>${project.version}</version>-->
88102
<!-- </dependency>-->
89103

104+
<dependency>
105+
<groupId>org.springframework</groupId>
106+
<artifactId>spring-webmvc</artifactId>
107+
</dependency>
108+
90109
</dependencies>
91110

92111
<build>

0 commit comments

Comments
 (0)