Skip to content

Commit 60bcc86

Browse files
Myna855-sapMyna855-sap
committed
fix compilation failure - keep spring-security-web/config as version pins instead of exclusions
1 parent 76e90f5 commit 60bcc86

4 files changed

Lines changed: 64 additions & 72 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: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,22 @@
1515
<name>bookshop</name>
1616

1717

18+
<dependencyManagement>
19+
<dependencies>
20+
<!-- Security fixes: force safe transitive versions -->
21+
<dependency>
22+
<groupId>org.springframework.security</groupId>
23+
<artifactId>spring-security-web</artifactId>
24+
<version>6.5.11</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>org.springframework.security</groupId>
28+
<artifactId>spring-security-config</artifactId>
29+
<version>6.5.11</version>
30+
</dependency>
31+
</dependencies>
32+
</dependencyManagement>
33+
1834
<!-- ACTUAL DEPENDENCIES -->
1935
<dependencies>
2036
<!-- CDS DEPENDENCIES -->
@@ -208,24 +224,6 @@
208224
<dependency>
209225
<groupId>org.springframework.boot</groupId>
210226
<artifactId>spring-boot-starter-security</artifactId>
211-
<exclusions>
212-
<exclusion>
213-
<groupId>org.springframework.security</groupId>
214-
<artifactId>spring-security-web</artifactId>
215-
</exclusion>
216-
<exclusion>
217-
<groupId>org.springframework.security</groupId>
218-
<artifactId>spring-security-config</artifactId>
219-
</exclusion>
220-
<exclusion>
221-
<groupId>ch.qos.logback</groupId>
222-
<artifactId>logback-classic</artifactId>
223-
</exclusion>
224-
<exclusion>
225-
<groupId>ch.qos.logback</groupId>
226-
<artifactId>logback-core</artifactId>
227-
</exclusion>
228-
</exclusions>
229227
</dependency>
230228

231229
<dependency>

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

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,22 @@
1515
<name>bookshop</name>
1616

1717

18+
<dependencyManagement>
19+
<dependencies>
20+
<!-- Security fixes: force safe transitive versions -->
21+
<dependency>
22+
<groupId>org.springframework.security</groupId>
23+
<artifactId>spring-security-web</artifactId>
24+
<version>6.5.11</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>org.springframework.security</groupId>
28+
<artifactId>spring-security-config</artifactId>
29+
<version>6.5.11</version>
30+
</dependency>
31+
</dependencies>
32+
</dependencyManagement>
33+
1834
<!-- ACTUAL DEPENDENCIES -->
1935
<dependencies>
2036
<!-- CDS DEPENDENCIES -->
@@ -213,24 +229,6 @@
213229
<dependency>
214230
<groupId>org.springframework.boot</groupId>
215231
<artifactId>spring-boot-starter-security</artifactId>
216-
<exclusions>
217-
<exclusion>
218-
<groupId>org.springframework.security</groupId>
219-
<artifactId>spring-security-web</artifactId>
220-
</exclusion>
221-
<exclusion>
222-
<groupId>org.springframework.security</groupId>
223-
<artifactId>spring-security-config</artifactId>
224-
</exclusion>
225-
<exclusion>
226-
<groupId>ch.qos.logback</groupId>
227-
<artifactId>logback-classic</artifactId>
228-
</exclusion>
229-
<exclusion>
230-
<groupId>ch.qos.logback</groupId>
231-
<artifactId>logback-core</artifactId>
232-
</exclusion>
233-
</exclusions>
234232
</dependency>
235233

236234
<dependency>

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

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,22 @@
1212

1313
<name>demoapp</name>
1414

15+
<dependencyManagement>
16+
<dependencies>
17+
<!-- Security fixes: force safe transitive versions -->
18+
<dependency>
19+
<groupId>org.springframework.security</groupId>
20+
<artifactId>spring-security-web</artifactId>
21+
<version>6.5.11</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.springframework.security</groupId>
25+
<artifactId>spring-security-config</artifactId>
26+
<version>6.5.11</version>
27+
</dependency>
28+
</dependencies>
29+
</dependencyManagement>
30+
1531
<!-- ACTUAL DEPENDENCIES -->
1632
<dependencies>
1733

@@ -105,24 +121,6 @@
105121
<dependency>
106122
<groupId>org.springframework.boot</groupId>
107123
<artifactId>spring-boot-starter-security</artifactId>
108-
<exclusions>
109-
<exclusion>
110-
<groupId>org.springframework.security</groupId>
111-
<artifactId>spring-security-web</artifactId>
112-
</exclusion>
113-
<exclusion>
114-
<groupId>org.springframework.security</groupId>
115-
<artifactId>spring-security-config</artifactId>
116-
</exclusion>
117-
<exclusion>
118-
<groupId>ch.qos.logback</groupId>
119-
<artifactId>logback-classic</artifactId>
120-
</exclusion>
121-
<exclusion>
122-
<groupId>ch.qos.logback</groupId>
123-
<artifactId>logback-core</artifactId>
124-
</exclusion>
125-
</exclusions>
126124
</dependency>
127125
</dependencies>
128126

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

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,22 @@
1212

1313
<name>demoapp</name>
1414

15+
<dependencyManagement>
16+
<dependencies>
17+
<!-- Security fixes: force safe transitive versions -->
18+
<dependency>
19+
<groupId>org.springframework.security</groupId>
20+
<artifactId>spring-security-web</artifactId>
21+
<version>6.5.11</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.springframework.security</groupId>
25+
<artifactId>spring-security-config</artifactId>
26+
<version>6.5.11</version>
27+
</dependency>
28+
</dependencies>
29+
</dependencyManagement>
30+
1531
<!-- ACTUAL DEPENDENCIES -->
1632
<dependencies>
1733

@@ -110,24 +126,6 @@
110126
<dependency>
111127
<groupId>org.springframework.boot</groupId>
112128
<artifactId>spring-boot-starter-security</artifactId>
113-
<exclusions>
114-
<exclusion>
115-
<groupId>org.springframework.security</groupId>
116-
<artifactId>spring-security-web</artifactId>
117-
</exclusion>
118-
<exclusion>
119-
<groupId>org.springframework.security</groupId>
120-
<artifactId>spring-security-config</artifactId>
121-
</exclusion>
122-
<exclusion>
123-
<groupId>ch.qos.logback</groupId>
124-
<artifactId>logback-classic</artifactId>
125-
</exclusion>
126-
<exclusion>
127-
<groupId>ch.qos.logback</groupId>
128-
<artifactId>logback-core</artifactId>
129-
</exclusion>
130-
</exclusions>
131129
</dependency>
132130
</dependencies>
133131

0 commit comments

Comments
 (0)