Revert "Revert "some forgotten ASM upgrades""

This reverts commit 8c0410f38bbcc002cf8147feff2995aaf489fc5d.


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/05cd14a4
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/05cd14a4
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/05cd14a4

Branch: refs/heads/master
Commit: 05cd14a451a361c411bba04c69c74a69ea3db55c
Parents: 0ace1db
Author: Jonathan Gallimore <j...@jrg.me.uk>
Authored: Tue Mar 13 11:24:30 2018 +0000
Committer: Jonathan Gallimore <j...@jrg.me.uk>
Committed: Tue Mar 13 11:24:30 2018 +0000

----------------------------------------------------------------------
 .../apache/openejb/config/PersistenceContextAnnFactory.java    | 2 +-
 .../src/main/java/org/apache/openejb/dyni/DynamicSubclass.java | 6 +++---
 .../main/java/org/apache/openejb/util/AnnotationFinder.java    | 2 +-
 .../src/test/java/org/apache/openejb/DependencyVisitor.java    | 2 +-
 .../src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/05cd14a4/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
----------------------------------------------------------------------
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
index 12adae1..66e2361 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
@@ -248,7 +248,7 @@ public class PersistenceContextAnnFactory {
         private final AsmPersistenceContext persistenceContext = new 
AsmPersistenceContext();
 
         public PersistenceContextVisitor(final String className, final String 
memberName, final Map<String, AsmPersistenceContext> contexts) {
-            super(Opcodes.ASM5);
+            super(Opcodes.ASM6);
             this.contexts = contexts;
             persistenceContext.name = className + "/" + memberName;
         }

http://git-wip-us.apache.org/repos/asf/tomee/blob/05cd14a4/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
----------------------------------------------------------------------
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
index fc0ff9a..c9dd53b 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
@@ -297,7 +297,7 @@ public class DynamicSubclass implements Opcodes {
         private final MethodVisitor newMethod;
 
         public MoveAnnotationsVisitor(final MethodVisitor movedMethod, final 
MethodVisitor newMethod) {
-            super(Opcodes.ASM5, movedMethod);
+            super(Opcodes.ASM6, movedMethod);
             this.newMethod = newMethod;
         }
 
@@ -323,7 +323,7 @@ public class DynamicSubclass implements Opcodes {
         private final ClassVisitor newClass;
 
         public CopyClassAnnotations(final ClassVisitor newClass) {
-            super(Opcodes.ASM5);
+            super(Opcodes.ASM6);
             this.newClass = newClass;
         }
 
@@ -337,7 +337,7 @@ public class DynamicSubclass implements Opcodes {
         private final Map<String, MethodVisitor> visitors;
 
         public CopyMethodAnnotations(final Map<String, MethodVisitor> 
visitors) {
-            super(Opcodes.ASM5);
+            super(Opcodes.ASM6);
             this.visitors = visitors;
         }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/05cd14a4/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
----------------------------------------------------------------------
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
index eb4587c..3f29b3a 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
@@ -327,7 +327,7 @@ public class AnnotationFinder {
         private final Filter filter;
 
         public Visitor(final Filter filter) {
-            super(Opcodes.ASM5);
+            super(Opcodes.ASM6);
             this.filter = filter;
 
             try {

http://git-wip-us.apache.org/repos/asf/tomee/blob/05cd14a4/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
----------------------------------------------------------------------
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
index fcaa6f8..6f8a215 100644
--- 
a/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
@@ -401,7 +401,7 @@ public class DependencyVisitor extends EmptyVisitor {
         private final DependencyVisitor delegate;
 
         public SignatureAdapter(final DependencyVisitor dependencyVisitor) {
-            super(Opcodes.ASM5);
+            super(Opcodes.ASM6);
             delegate = dependencyVisitor;
         }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/05cd14a4/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
----------------------------------------------------------------------
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
index c194edc..3c75490 100644
--- 
a/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
@@ -367,7 +367,7 @@ public class JpaTest extends TestCase {
 
     public static class FieldAdderClassVisitor extends ClassVisitor {
         public FieldAdderClassVisitor(final ClassVisitor classVisitor) {
-            super(Opcodes.ASM5, classVisitor);
+            super(Opcodes.ASM6, classVisitor);
         }
 
         public void visitEnd() {

Reply via email to