[cxf] branch 3.2.x-fixes updated: Adding support for XBean asm7 shade

[co...@apache.org]

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

coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
     new c5447e3  Adding support for XBean asm7 shade
c5447e3 is described below

commit c5447e3591e2ce2cd7721b095d16c9bfc4b319f0
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Wed Oct 3 11:22:52 2018 +0200

    Adding support for XBean asm7 shade
    
    (cherry picked from commit 4314ae71b887e168a50824bcc4e04145390a4798)
---
 core/src/main/java/org/apache/cxf/common/util/ASMHelper.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java b/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
index 475150f..6f481d0 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
@@ -93,6 +93,7 @@ public class ASMHelper {
         if (cwClass == null) {
             //try the "real" asm first, then the others
             tryClass("org.objectweb.asm.ClassWriter");
+            tryClass("org.apache.xbean.asm7.ClassWriter");
             tryClass("org.apache.xbean.asm5.ClassWriter");
             tryClass("org.apache.xbean.asm6.ClassWriter");
             tryClass("org.apache.xbean.asm4.ClassWriter");