Skip to content

Commit a671125

Browse files
Proposed WW-5074 Fix:
- Exclude ASM 3.3.1 from inclusion as a dependency for commons-digester3 (also mark commons-digester3 as optional dependency since it is only listed to allow the exclusion). - Provide explicit test dependency of ASM 3.3.1 for portlet-plugin (otherwise its jmock tests are unable to execute).
1 parent 0a53999 commit a671125

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

plugins/portlet/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,15 @@
101101
<scope>test</scope>
102102
</dependency>
103103

104+
<dependency>
105+
<!-- Requires ASM 3.3.1 for testing, as jmock-cglib apparently overrides a method made final in later ASM versions
106+
(and apparently jmock-cglib still requires ASM, despite no visible tree dependency). -->
107+
<groupId>asm</groupId>
108+
<artifactId>asm</artifactId>
109+
<version>3.3.1</version>
110+
<scope>test</scope>
111+
</dependency>
112+
104113
<dependency>
105114
<groupId>mockobjects</groupId>
106115
<artifactId>mockobjects-core</artifactId>

pom.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,21 @@
751751
<artifactId>asm-commons</artifactId>
752752
<version>${asm.version}</version>
753753
</dependency>
754+
755+
<dependency>
756+
<groupId>org.apache.commons</groupId>
757+
<artifactId>commons-digester3</artifactId>
758+
<optional>true</optional>
759+
<!-- Prevent inclusion of ASM 3.3.1 via transitive dependency from velocity-tools-view/commons-digester3/cglib 2.2.2
760+
(its presence creates classpath conflicts / duplicate ASM jars due to ASM groupId changing after 3.x). -->
761+
<exclusions>
762+
<exclusion>
763+
<groupId>asm</groupId>
764+
<artifactId>asm</artifactId>
765+
</exclusion>
766+
</exclusions>
767+
</dependency>
768+
754769
<dependency>
755770
<groupId>junit</groupId>
756771
<artifactId>junit</artifactId>

0 commit comments

Comments
 (0)