Skip to content

Commit 2246bed

Browse files
Copilotvharseko
andauthored
Fix CI: exclude old-group javassist from click-nodeps, click-extras, and ognl deps in openam-core to fix PowerMock 2.x classpath conflict
Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenAM/sessions/8269faaa-c2d9-426a-9ab2-931c51a9cfc0 Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com>
1 parent 671a047 commit 2246bed

2 files changed

Lines changed: 26 additions & 0 deletions

File tree

openam-core/pom.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,17 +260,36 @@
260260
<groupId>org.apache.click</groupId>
261261
<artifactId>click-nodeps</artifactId>
262262
<version>${click.version}</version>
263+
<exclusions>
264+
<!-- Exclude old-group javassist to prevent shadowing org.javassist:javassist required by PowerMock 2.x -->
265+
<exclusion>
266+
<groupId>javassist</groupId>
267+
<artifactId>javassist</artifactId>
268+
</exclusion>
269+
</exclusions>
263270
</dependency>
264271

265272
<dependency>
266273
<groupId>org.apache.click</groupId>
267274
<artifactId>click-extras</artifactId>
268275
<version>${click.version}</version>
276+
<exclusions>
277+
<exclusion>
278+
<groupId>javassist</groupId>
279+
<artifactId>javassist</artifactId>
280+
</exclusion>
281+
</exclusions>
269282
</dependency>
270283

271284
<dependency>
272285
<groupId>ognl</groupId>
273286
<artifactId>ognl</artifactId>
287+
<exclusions>
288+
<exclusion>
289+
<groupId>javassist</groupId>
290+
<artifactId>javassist</artifactId>
291+
</exclusion>
292+
</exclusions>
274293
</dependency>
275294

276295
<dependency>

pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,13 @@
424424
<groupId>ognl</groupId>
425425
<artifactId>ognl</artifactId>
426426
<version>3.0.21</version>
427+
<exclusions>
428+
<!-- Exclude old-group javassist to prevent shadowing org.javassist:javassist:3.27.0-GA required by PowerMock 2.x -->
429+
<exclusion>
430+
<groupId>javassist</groupId>
431+
<artifactId>javassist</artifactId>
432+
</exclusion>
433+
</exclusions>
427434
</dependency>
428435
<!-- Pin javassist for PowerMock 2.x compatibility (CtClass.getDeclaredClasses()) -->
429436
<dependency>

0 commit comments

Comments
 (0)