From 211cea18b34afe66a8c4d91d03db48a44d0be1d3 Mon Sep 17 00:00:00 2001
From: Jonathan Gallimore <jon@jrg.me.uk>
Date: Tue, 13 Mar 2018 14:12:27 +0000
Subject: [PATCH 1/2] Update to ASM 6

---
 openjpa-kernel/pom.xml                                    | 4 ++--
 .../main/java/org/apache/openjpa/enhance/AsmAdaptor.java  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml
index eac77766c2..f299755858 100644
--- a/openjpa-kernel/pom.xml
+++ b/openjpa-kernel/pom.xml
@@ -75,8 +75,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-asm5-shaded</artifactId>
-            <version>3.17</version>
+            <artifactId>xbean-asm6-shaded</artifactId>
+            <version>4.6</version>
         </dependency>
     </dependencies>
 
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java
index cfca1947d4..978e6c37e4 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java
@@ -28,10 +28,10 @@
 import java.io.OutputStream;
 import java.net.URLDecoder;
 
-import org.apache.xbean.asm5.ClassReader;
-import org.apache.xbean.asm5.ClassVisitor;
-import org.apache.xbean.asm5.ClassWriter;
-import org.apache.xbean.asm5.Opcodes;
+import org.apache.xbean.asm6.ClassReader;
+import org.apache.xbean.asm6.ClassVisitor;
+import org.apache.xbean.asm6.ClassWriter;
+import org.apache.xbean.asm6.Opcodes;
 import serp.bytecode.BCClass;
 
 import static java.util.Arrays.asList;

From 5ae3b974c1e68977f62e2649568f8d12acb09f3f Mon Sep 17 00:00:00 2001
From: Jonathan Gallimore <jon@jrg.me.uk>
Date: Wed, 14 Mar 2018 14:15:46 +0000
Subject: [PATCH 2/2] Update ASM constant

---
 .../src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java
index 978e6c37e4..13dfe35f31 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java
@@ -116,7 +116,7 @@ public static boolean isEnhanced(final byte[] b)
         final ClassReader cr = new ClassReader(b);
         try
         {
-            cr.accept(new ClassVisitor(Opcodes.ASM5)
+            cr.accept(new ClassVisitor(Opcodes.ASM6)
             {
                 @Override
                 public void visit(final int i, final int i1,