You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by il...@apache.org on 2018/03/14 14:21:12 UTC

svn commit: r1826719 - in /openjpa/branches/2.4.x/openjpa-kernel: pom.xml src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java

Author: ilgrosso
Date: Wed Mar 14 14:21:12 2018
New Revision: 1826719

URL: http://svn.apache.org/viewvc?rev=1826719&view=rev
Log:
OPENJPA-2730 Update to ASM 6 - This closes #12

Modified:
    openjpa/branches/2.4.x/openjpa-kernel/pom.xml
    openjpa/branches/2.4.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java

Modified: openjpa/branches/2.4.x/openjpa-kernel/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.4.x/openjpa-kernel/pom.xml?rev=1826719&r1=1826718&r2=1826719&view=diff
==============================================================================
--- openjpa/branches/2.4.x/openjpa-kernel/pom.xml (original)
+++ openjpa/branches/2.4.x/openjpa-kernel/pom.xml Wed Mar 14 14:21:12 2018
@@ -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>
 

Modified: openjpa/branches/2.4.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.4.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java?rev=1826719&r1=1826718&r2=1826719&view=diff
==============================================================================
--- openjpa/branches/2.4.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java (original)
+++ openjpa/branches/2.4.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/AsmAdaptor.java Wed Mar 14 14:21:12 2018
@@ -28,10 +28,10 @@ import java.io.InputStream;
 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;
@@ -116,7 +116,7 @@ public final class AsmAdaptor {
         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,