Skip to content

Commit a9ae7bb

Browse files
LightGuardLightGuard
committed
Updating Tomcat to latest v9
We can't easily go to 10 or 11 because of javaee -> jakarta issues Signed-off-by: Jason Porter <[email protected]>
1 parent adedb93 commit a9ae7bb

File tree

6 files changed

+118
-5
lines changed
  • kie-spring-boot
    • kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration
    • kie-spring-boot-samples/jbpm-spring-boot-sample-basic
    • kie-spring-boot-starters
      • kie-server-spring-boot-starter-drools
      • kie-server-spring-boot-starter-jbpm
      • kie-server-spring-boot-starter
    • pom.xml

6 files changed

+118
-5
lines changed

‎kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration/pom.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,33 @@
2727
<artifactId>spring-boot-autoconfigure</artifactId>
2828
</dependency>
2929

30+
<!-- Spring Boot v2 has no updates, but the tomcat version it uses has multiple CVEs -->
31+
<!-- For this reason, we're going to include our own version of tomcat and exclude what it brings in -->
3032
<dependency>
3133
<groupId>org.springframework.boot</groupId>
3234
<artifactId>spring-boot-starter-web</artifactId>
35+
<exclusions>
36+
<exclusion>
37+
<groupId>org.apache.tomcat.embed</groupId>
38+
<artifactId>tomcat-embed-core</artifactId>
39+
</exclusion>
40+
<exclusion>
41+
<groupId>org.apache.tomcat.embed</groupId>
42+
<artifactId>tomcat-embed-websocket</artifactId>
43+
</exclusion>
44+
</exclusions>
3345
</dependency>
46+
<dependency>
47+
<groupId>org.apache.tomcat.embed</groupId>
48+
<artifactId>tomcat-embed-websocket</artifactId>
49+
<scope>compile</scope>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.apache.tomcat.embed</groupId>
53+
<artifactId>tomcat-embed-core</artifactId>
54+
<scope>compile</scope>
55+
</dependency>
56+
3457
<dependency>
3558
<groupId>org.springframework.boot</groupId>
3659
<artifactId>spring-boot-starter-validation</artifactId>

‎kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/pom.xml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,20 @@
3939
</exclusion>
4040
</exclusions>
4141
</dependency>
42+
<!-- Spring Boot v2 has no updates, but the tomcat version it uses has multiple CVEs -->
43+
<!-- For this reason, we're going to include our own version of tomcat and exclude what it brings in -->
4244
<dependency>
4345
<groupId>org.springframework.boot</groupId>
4446
<artifactId>spring-boot-starter-web</artifactId>
4547
<exclusions>
48+
<exclusion>
49+
<groupId>org.apache.tomcat.embed</groupId>
50+
<artifactId>tomcat-embed-core</artifactId>
51+
</exclusion>
52+
<exclusion>
53+
<groupId>org.apache.tomcat.embed</groupId>
54+
<artifactId>tomcat-embed-websocket</artifactId>
55+
</exclusion>
4656
<exclusion>
4757
<groupId>org.apache.tomcat.embed</groupId>
4858
<artifactId>tomcat-embed-el</artifactId>
@@ -57,6 +67,15 @@
5767
</exclusion>
5868
</exclusions>
5969
</dependency>
70+
<dependency>
71+
<groupId>org.apache.tomcat.embed</groupId>
72+
<artifactId>tomcat-embed-websocket</artifactId>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.apache.tomcat.embed</groupId>
76+
<artifactId>tomcat-embed-core</artifactId>
77+
</dependency>
78+
6079

6180
<!-- test dependencies -->
6281
<dependency>
@@ -186,4 +205,4 @@
186205
</plugins>
187206
</pluginManagement>
188207
</build>
189-
</project>
208+
</project>

‎kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter-drools/pom.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,31 @@
1111
<description>Drools and DMN - KIE Server SpringBoot Starter</description>
1212

1313
<dependencies>
14+
<!-- Spring Boot v2 has no updates, but the tomcat version it uses has multiple CVEs -->
15+
<!-- For this reason, we're going to include our own version of tomcat and exclude what it brings in -->
1416
<dependency>
1517
<groupId>org.springframework.boot</groupId>
1618
<artifactId>spring-boot-starter-web</artifactId>
19+
<exclusions>
20+
<exclusion>
21+
<groupId>org.apache.tomcat.embed</groupId>
22+
<artifactId>tomcat-embed-core</artifactId>
23+
</exclusion>
24+
<exclusion>
25+
<groupId>org.apache.tomcat.embed</groupId>
26+
<artifactId>tomcat-embed-websocket</artifactId>
27+
</exclusion>
28+
</exclusions>
1729
</dependency>
30+
<dependency>
31+
<groupId>org.apache.tomcat.embed</groupId>
32+
<artifactId>tomcat-embed-websocket</artifactId>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.apache.tomcat.embed</groupId>
36+
<artifactId>tomcat-embed-core</artifactId>
37+
</dependency>
38+
1839
<dependency>
1940
<groupId>org.apache.cxf</groupId>
2041
<artifactId>cxf-spring-boot-starter-jaxrs</artifactId>

‎kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter-jbpm/pom.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,20 @@
1313
<description>jBPM and Case management - KIE Server SpringBoot Starter</description>
1414

1515
<dependencies>
16+
<!-- Spring Boot v2 has no updates, but the tomcat version it uses has multiple CVEs -->
17+
<!-- For this reason, we're going to include our own version of tomcat and exclude what it brings in -->
1618
<dependency>
1719
<groupId>org.springframework.boot</groupId>
1820
<artifactId>spring-boot-starter-web</artifactId>
1921
<exclusions>
22+
<exclusion>
23+
<groupId>org.apache.tomcat.embed</groupId>
24+
<artifactId>tomcat-embed-core</artifactId>
25+
</exclusion>
26+
<exclusion>
27+
<groupId>org.apache.tomcat.embed</groupId>
28+
<artifactId>tomcat-embed-websocket</artifactId>
29+
</exclusion>
2030
<exclusion>
2131
<groupId>org.apache.tomcat</groupId>
2232
<artifactId>tomcat-annotations-api</artifactId>
@@ -27,6 +37,15 @@
2737
</exclusion>
2838
</exclusions>
2939
</dependency>
40+
<dependency>
41+
<groupId>org.apache.tomcat.embed</groupId>
42+
<artifactId>tomcat-embed-websocket</artifactId>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.apache.tomcat.embed</groupId>
46+
<artifactId>tomcat-embed-core</artifactId>
47+
</dependency>
48+
3049
<dependency>
3150
<groupId>org.springframework.boot</groupId>
3251
<artifactId>spring-boot-starter-jdbc</artifactId>

‎kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter/pom.xml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,21 @@
1313
<description>KIE Server SpringBoot Starter</description>
1414

1515

16-
<dependencies>
16+
<dependencies>
17+
<!-- Spring Boot v2 has no updates, but the tomcat version it uses has multiple CVEs -->
18+
<!-- For this reason, we're going to include our own version of tomcat and exclude what it brings in -->
1719
<dependency>
1820
<groupId>org.springframework.boot</groupId>
1921
<artifactId>spring-boot-starter-web</artifactId>
2022
<exclusions>
23+
<exclusion>
24+
<groupId>org.apache.tomcat.embed</groupId>
25+
<artifactId>tomcat-embed-core</artifactId>
26+
</exclusion>
27+
<exclusion>
28+
<groupId>org.apache.tomcat.embed</groupId>
29+
<artifactId>tomcat-embed-websocket</artifactId>
30+
</exclusion>
2131
<exclusion>
2232
<groupId>org.apache.tomcat</groupId>
2333
<artifactId>tomcat-annotations-api</artifactId>
@@ -28,6 +38,15 @@
2838
</exclusion>
2939
</exclusions>
3040
</dependency>
41+
<dependency>
42+
<groupId>org.apache.tomcat.embed</groupId>
43+
<artifactId>tomcat-embed-websocket</artifactId>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.apache.tomcat.embed</groupId>
47+
<artifactId>tomcat-embed-core</artifactId>
48+
</dependency>
49+
3150
<dependency>
3251
<groupId>org.springframework.boot</groupId>
3352
<artifactId>spring-boot-starter-jdbc</artifactId>

‎kie-spring-boot/pom.xml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,32 @@
9393
</exclusions>
9494
</dependency>
9595

96+
97+
<!-- Spring Boot v2 has no updates, but the tomcat version it uses has multiple CVEs -->
98+
<!-- For this reason, we're going to include our own version of tomcat and exclude what it brings in -->
9699
<dependency>
97100
<groupId>org.springframework.boot</groupId>
98101
<artifactId>spring-boot-starter-web</artifactId>
99102
<version>${version.org.springframework.boot}</version>
103+
<exclusions>
104+
<exclusion>
105+
<groupId>org.apache.tomcat.embed</groupId>
106+
<artifactId>tomcat-embed-core</artifactId>
107+
</exclusion>
108+
<exclusion>
109+
<groupId>org.apache.tomcat.embed</groupId>
110+
<artifactId>tomcat-embed-websocket</artifactId>
111+
</exclusion>
112+
</exclusions>
100113
</dependency>
101-
102114
<dependency>
103115
<groupId>org.apache.tomcat.embed</groupId>
104-
<artifactId>tomcat-embed-core</artifactId>
116+
<artifactId>tomcat-embed-websocket</artifactId>
105117
<version>${version.org.apache.tomcat}</version>
106118
</dependency>
107119
<dependency>
108120
<groupId>org.apache.tomcat.embed</groupId>
109-
<artifactId>tomcat-embed-websocket</artifactId>
121+
<artifactId>tomcat-embed-core</artifactId>
110122
<version>${version.org.apache.tomcat}</version>
111123
</dependency>
112124
<dependency>

0 commit comments

Comments
 (0)