[struts] branch master updated: 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).

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/master by this push:
     new a671125  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).
     new f4ab5bf  Merge pull request #413 from 
JCgH4164838Gh792C124B5/WW-5074_CfgFix
a671125 is described below

commit a6711251a68dea3f3ac89524fc65f59c7700cb15
Author: JCgH4164838Gh792C124B5 
<43964333+jcgh4164838gh792c12...@users.noreply.github.com>
AuthorDate: Sun May 3 12:58:37 2020 -0400

    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).
---
 plugins/portlet/pom.xml |  9 +++++++++
 pom.xml                 | 15 +++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 31d35c5..0b6576b 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -102,6 +102,15 @@
         </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>
             <scope>test</scope>
diff --git a/pom.xml b/pom.xml
index a551c0d..4c83307 100644
--- a/pom.xml
+++ b/pom.xml
@@ -751,6 +751,21 @@
                 <artifactId>asm-commons</artifactId>
                 <version>${asm.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-digester3</artifactId>
+                <optional>true</optional>
+                <!-- Prevent inclusion of ASM 3.3.1 via transitive dependency 
from velocity-tools-view/commons-digester3/cglib 2.2.2
+                     (its presence creates classpath conflicts / duplicate ASM 
jars due to ASM groupId changing after 3.x).  -->
+                <exclusions>
+                    <exclusion>
+                        <groupId>asm</groupId>
+                        <artifactId>asm</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>