Skip to content

Commit 8f4fc33

Browse files
Myna855-sapMyna855-sap
committed
fix compilation - revert tomcat-embed exclusions, keep as version pins
1 parent 312f4b2 commit 8f4fc33

4 files changed

Lines changed: 60 additions & 56 deletions

File tree

  • app
    • multi-tenant
      • central-space/cloud-cap-samples-java/srv
      • personal-space/cloud-cap-samples-java/srv
    • single-tenant

‎app/multi-tenant/central-space/cloud-cap-samples-java/srv/pom.xml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,21 @@
2828
<artifactId>spring-security-config</artifactId>
2929
<version>6.5.11</version>
3030
</dependency>
31+
<dependency>
32+
<groupId>org.apache.tomcat.embed</groupId>
33+
<artifactId>tomcat-embed-core</artifactId>
34+
<version>10.1.56</version>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.apache.tomcat.embed</groupId>
38+
<artifactId>tomcat-embed-websocket</artifactId>
39+
<version>10.1.56</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.apache.tomcat.embed</groupId>
43+
<artifactId>tomcat-embed-el</artifactId>
44+
<version>10.1.56</version>
45+
</dependency>
3146
</dependencies>
3247
</dependencyManagement>
3348

@@ -37,20 +52,6 @@
3752
<dependency>
3853
<groupId>com.sap.cds</groupId>
3954
<artifactId>cds-starter-spring-boot</artifactId>
40-
<exclusions>
41-
<exclusion>
42-
<groupId>org.apache.tomcat.embed</groupId>
43-
<artifactId>tomcat-embed-core</artifactId>
44-
</exclusion>
45-
<exclusion>
46-
<groupId>org.apache.tomcat.embed</groupId>
47-
<artifactId>tomcat-embed-websocket</artifactId>
48-
</exclusion>
49-
<exclusion>
50-
<groupId>org.apache.tomcat.embed</groupId>
51-
<artifactId>tomcat-embed-el</artifactId>
52-
</exclusion>
53-
</exclusions>
5455
</dependency>
5556

5657
<dependency>

‎app/multi-tenant/personal-space/cloud-cap-samples-java/srv/pom.xml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,21 @@
2828
<artifactId>spring-security-config</artifactId>
2929
<version>6.5.11</version>
3030
</dependency>
31+
<dependency>
32+
<groupId>org.apache.tomcat.embed</groupId>
33+
<artifactId>tomcat-embed-core</artifactId>
34+
<version>10.1.56</version>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.apache.tomcat.embed</groupId>
38+
<artifactId>tomcat-embed-websocket</artifactId>
39+
<version>10.1.56</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.apache.tomcat.embed</groupId>
43+
<artifactId>tomcat-embed-el</artifactId>
44+
<version>10.1.56</version>
45+
</dependency>
3146
</dependencies>
3247
</dependencyManagement>
3348

@@ -37,20 +52,6 @@
3752
<dependency>
3853
<groupId>com.sap.cds</groupId>
3954
<artifactId>cds-starter-spring-boot</artifactId>
40-
<exclusions>
41-
<exclusion>
42-
<groupId>org.apache.tomcat.embed</groupId>
43-
<artifactId>tomcat-embed-core</artifactId>
44-
</exclusion>
45-
<exclusion>
46-
<groupId>org.apache.tomcat.embed</groupId>
47-
<artifactId>tomcat-embed-websocket</artifactId>
48-
</exclusion>
49-
<exclusion>
50-
<groupId>org.apache.tomcat.embed</groupId>
51-
<artifactId>tomcat-embed-el</artifactId>
52-
</exclusion>
53-
</exclusions>
5455
</dependency>
5556

5657
<dependency>

‎app/single-tenant/central-space/demoapp/srv/pom.xml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,21 @@
2525
<artifactId>spring-security-config</artifactId>
2626
<version>6.5.11</version>
2727
</dependency>
28+
<dependency>
29+
<groupId>org.apache.tomcat.embed</groupId>
30+
<artifactId>tomcat-embed-core</artifactId>
31+
<version>10.1.56</version>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.apache.tomcat.embed</groupId>
35+
<artifactId>tomcat-embed-websocket</artifactId>
36+
<version>10.1.56</version>
37+
</dependency>
38+
<dependency>
39+
<groupId>org.apache.tomcat.embed</groupId>
40+
<artifactId>tomcat-embed-el</artifactId>
41+
<version>10.1.56</version>
42+
</dependency>
2843
</dependencies>
2944
</dependencyManagement>
3045

@@ -56,20 +71,6 @@
5671
<dependency>
5772
<groupId>com.sap.cds</groupId>
5873
<artifactId>cds-starter-spring-boot</artifactId>
59-
<exclusions>
60-
<exclusion>
61-
<groupId>org.apache.tomcat.embed</groupId>
62-
<artifactId>tomcat-embed-core</artifactId>
63-
</exclusion>
64-
<exclusion>
65-
<groupId>org.apache.tomcat.embed</groupId>
66-
<artifactId>tomcat-embed-websocket</artifactId>
67-
</exclusion>
68-
<exclusion>
69-
<groupId>org.apache.tomcat.embed</groupId>
70-
<artifactId>tomcat-embed-el</artifactId>
71-
</exclusion>
72-
</exclusions>
7374
</dependency>
7475

7576
<!-- ODATA PROTOCOL ADAPTER -->

‎app/single-tenant/personal-space/demoapp/srv/pom.xml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,21 @@
2525
<artifactId>spring-security-config</artifactId>
2626
<version>6.5.11</version>
2727
</dependency>
28+
<dependency>
29+
<groupId>org.apache.tomcat.embed</groupId>
30+
<artifactId>tomcat-embed-core</artifactId>
31+
<version>10.1.56</version>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.apache.tomcat.embed</groupId>
35+
<artifactId>tomcat-embed-websocket</artifactId>
36+
<version>10.1.56</version>
37+
</dependency>
38+
<dependency>
39+
<groupId>org.apache.tomcat.embed</groupId>
40+
<artifactId>tomcat-embed-el</artifactId>
41+
<version>10.1.56</version>
42+
</dependency>
2843
</dependencies>
2944
</dependencyManagement>
3045

@@ -61,20 +76,6 @@
6176
<dependency>
6277
<groupId>com.sap.cds</groupId>
6378
<artifactId>cds-starter-spring-boot</artifactId>
64-
<exclusions>
65-
<exclusion>
66-
<groupId>org.apache.tomcat.embed</groupId>
67-
<artifactId>tomcat-embed-core</artifactId>
68-
</exclusion>
69-
<exclusion>
70-
<groupId>org.apache.tomcat.embed</groupId>
71-
<artifactId>tomcat-embed-websocket</artifactId>
72-
</exclusion>
73-
<exclusion>
74-
<groupId>org.apache.tomcat.embed</groupId>
75-
<artifactId>tomcat-embed-el</artifactId>
76-
</exclusion>
77-
</exclusions>
7879
</dependency>
7980

8081
<!-- ODATA PROTOCOL ADAPTER -->

0 commit comments

Comments
 (0)