Skip to content

Commit 8a62d8c

Browse files
SunPengWanSunPengWan
committed
1、排除 servlet-api.2.5 jar 2、 dss-server 添加dss-scritis-server包的引用
1 parent 8e7f0ea commit 8a62d8c

File tree

20 files changed

+103
-2
lines changed
  • assembly/dss-package
  • dss-appconn
    • appconns/dss-sendemail-appconn/sendemail-appconn-core
    • dss-appconn-core
    • linkis-appconn-engineplugin
  • dss-apps
  • dss-commons
  • dss-framework
    • dss-appconn-framework
    • dss-framework-admin-service
    • dss-framework-project-server
    • dss-framework-proxy-user-service
    • dss-framework-workspace-server
    • framework-plugins
      • dss-framework-migrate-server
      • dss-framework-orchestrator-publish
  • dss-orchestrator/dss-orchestrator-core
  • dss-server
  • plugins
    • azkaban/linkis-jobtype
    • dolphinscheduler/dss-dolphinscheduler-token
    • linkis/dss-gateway-support

20 files changed

+103
-2
lines changed

‎assembly/dss-package/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@
5656
<artifactId>xstream</artifactId>
5757
<groupId>com.thoughtworks.xstream</groupId>
5858
</exclusion>
59+
<exclusion>
60+
<artifactId>servlet-api</artifactId>
61+
<groupId>javax.servlet</groupId>
62+
</exclusion>
5963
</exclusions>
6064
</dependency>
6165
<dependency>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,12 @@
126126
<version>${linkis.version}</version>
127127
<scope>provided</scope>
128128
<optional>true</optional>
129+
<exclusions>
130+
<exclusion>
131+
<artifactId>servlet-api</artifactId>
132+
<groupId>javax.servlet</groupId>
133+
</exclusion>
134+
</exclusions>
129135
</dependency>
130136

131137
<dependency>

‎dss-appconn/dss-appconn-core/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@
9494
<artifactId>linkis-module</artifactId>
9595
<version>${linkis.version}</version>
9696
<scope>provided</scope>
97+
<exclusions>
98+
<exclusion>
99+
<artifactId>servlet-api</artifactId>
100+
<groupId>javax.servlet</groupId>
101+
</exclusion>
102+
</exclusions>
97103
</dependency>
98104
<dependency>
99105
<groupId>com.webank.wedatasphere.dss</groupId>

‎dss-appconn/linkis-appconn-engineplugin/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@
7171
<artifactId>jersey-server</artifactId>
7272
<groupId>com.sun.jersey</groupId>
7373
</exclusion>
74+
<exclusion>
75+
<artifactId>servlet-api</artifactId>
76+
<groupId>javax.servlet</groupId>
77+
</exclusion>
7478
</exclusions>
7579
</dependency>
7680

‎dss-apps/dss-apiservice-server/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@
6969
<artifactId>xstream</artifactId>
7070
<groupId>com.thoughtworks.xstream</groupId>
7171
</exclusion>
72+
<exclusion>
73+
<artifactId>servlet-api</artifactId>
74+
<groupId>javax.servlet</groupId>
75+
</exclusion>
7276
</exclusions>
7377
</dependency>
7478
<dependency>

‎dss-apps/dss-scriptis-server/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@
7171
<artifactId>xstream</artifactId>
7272
<groupId>com.thoughtworks.xstream</groupId>
7373
</exclusion>
74+
75+
<exclusion>
76+
<artifactId>servlet-api</artifactId>
77+
<groupId>javax.servlet</groupId>
78+
</exclusion>
79+
7480
</exclusions>
7581
</dependency>
7682
<dependency>

‎dss-commons/dss-common/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,12 @@
150150
<artifactId>linkis-module</artifactId>
151151
<version>${linkis.version}</version>
152152
<scope>provided</scope>
153+
<exclusions>
154+
<exclusion>
155+
<artifactId>servlet-api</artifactId>
156+
<groupId>javax.servlet</groupId>
157+
</exclusion>
158+
</exclusions>
153159
</dependency>
154160
<dependency>
155161
<groupId>org.apache.linkis</groupId>

‎dss-commons/dss-sender-service/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
<artifactId>commons-fileupload</artifactId>
4646
<groupId>commons-fileupload</groupId>
4747
</exclusion>
48+
<exclusion>
49+
<artifactId>servlet-api</artifactId>
50+
<groupId>javax.servlet</groupId>
51+
</exclusion>
4852
</exclusions>
4953
</dependency>
5054
<dependency>

‎dss-framework/dss-appconn-framework/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@
7070
<artifactId>linkis-common</artifactId>
7171
<groupId>org.apache.linkis</groupId>
7272
</exclusion>
73+
<exclusion>
74+
<artifactId>servlet-api</artifactId>
75+
<groupId>javax.servlet</groupId>
76+
</exclusion>
7377
</exclusions>
7478
</dependency>
7579
<dependency>

‎dss-framework/dss-framework-admin-service/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@
2222
<artifactId>linkis-module</artifactId>
2323
<version>${linkis.version}</version>
2424
<scope>provided</scope>
25+
<exclusions>
26+
<exclusion>
27+
<artifactId>servlet-api</artifactId>
28+
<groupId>javax.servlet</groupId>
29+
</exclusion>
30+
</exclusions>
2531

2632
</dependency>
2733
<!--TODO 一个需要干掉的dependency-->

0 commit comments

Comments
 (0)