mirror of
https://github.com/apache/struts.git
synced 2026-08-07 15:46:57 +00:00
Upgrade ASM and exclude conflicting artifact
This commit is contained in:
@@ -80,15 +80,6 @@
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<!-- Requires ASM 3.3.1 for testing, as jmock-cglib apparently overrides a method made final in later ASM versions
|
||||
(and apparently jmock-cglib still requires ASM, despite no visible tree dependency). -->
|
||||
<groupId>asm</groupId>
|
||||
<artifactId>asm</artifactId>
|
||||
<version>3.3.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>mockobjects</groupId>
|
||||
<artifactId>mockobjects-core</artifactId>
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
|
||||
<!-- dependency versions in alphanumeric order -->
|
||||
<asm.version>9.5</asm.version>
|
||||
<asm.version>9.6</asm.version>
|
||||
<jackson.version>2.15.3</jackson.version>
|
||||
<log4j2.version>2.20.0</log4j2.version>
|
||||
<ognl.version>3.3.4</ognl.version>
|
||||
@@ -765,6 +765,10 @@
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>asm</groupId>
|
||||
<artifactId>asm</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user