tomee git commit: ASM fixes previously missed

[jgallimore]

Repository: tomee
Updated Branches:
  refs/heads/fb_tomee8 59c398d19 -> ebad7d709


ASM fixes previously missed


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

Branch: refs/heads/fb_tomee8
Commit: ebad7d709a7524938c8505c835eeb964245bb7cc
Parents: 59c398d
Author: Jonathan Gallimore 
Authored: Wed Mar 14 14:44:25 2018 +
Committer: Jonathan Gallimore 
Committed: Mon Apr 16 21:39:08 2018 +0100

--
 .../org/apache/openejb/config/ServiceClasspathTest.java   | 10 +-
 .../java/org/apache/openejb/core/cmp/jpa/JpaTest.java |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/ebad7d70/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
index a8b59dc..51fd351 100644
--- 
a/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
@@ -53,11 +53,11 @@ import java.util.Properties;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import static org.apache.xbean.asm5.Opcodes.ACC_PUBLIC;
-import static org.apache.xbean.asm5.Opcodes.ACC_SUPER;
-import static org.apache.xbean.asm5.Opcodes.ALOAD;
-import static org.apache.xbean.asm5.Opcodes.INVOKESPECIAL;
-import static org.apache.xbean.asm5.Opcodes.RETURN;
+import static org.apache.xbean.asm6.Opcodes.ACC_PUBLIC;
+import static org.apache.xbean.asm6.Opcodes.ACC_SUPER;
+import static org.apache.xbean.asm6.Opcodes.ALOAD;
+import static org.apache.xbean.asm6.Opcodes.INVOKESPECIAL;
+import static org.apache.xbean.asm6.Opcodes.RETURN;
 
 /**
  * @version $Rev$ $Date$

http://git-wip-us.apache.org/repos/asf/tomee/blob/ebad7d70/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 3c75490..ad38935 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
@@ -54,8 +54,8 @@ import java.util.Hashtable;
 import java.util.Map;
 import java.util.Properties;
 
-import static org.apache.xbean.asm5.Opcodes.ACC_PRIVATE;
-import static org.apache.xbean.asm5.Opcodes.ACC_TRANSIENT;
+import static org.apache.xbean.asm6.Opcodes.ACC_PRIVATE;
+import static org.apache.xbean.asm6.Opcodes.ACC_TRANSIENT;
 
 public class JpaTest extends TestCase {
 static {

[6/8] tomee git commit: ASM fixes previously missed

[jgallimore]

ASM fixes previously missed


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

Branch: refs/heads/master
Commit: 91c84e148861b0e4dfd017b5067f870b75160a4c
Parents: ac3a415
Author: Jonathan Gallimore 
Authored: Wed Mar 14 14:44:25 2018 +
Committer: Jonathan Gallimore 
Committed: Wed Mar 14 14:44:25 2018 +

--
 .../org/apache/openejb/config/ServiceClasspathTest.java   | 10 +-
 .../java/org/apache/openejb/core/cmp/jpa/JpaTest.java |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tomee/blob/91c84e14/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
--
diff --git 
a/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
 
b/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
index a8b59dc..51fd351 100644
--- 
a/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
+++ 
b/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
@@ -53,11 +53,11 @@ import java.util.Properties;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import static org.apache.xbean.asm5.Opcodes.ACC_PUBLIC;
-import static org.apache.xbean.asm5.Opcodes.ACC_SUPER;
-import static org.apache.xbean.asm5.Opcodes.ALOAD;
-import static org.apache.xbean.asm5.Opcodes.INVOKESPECIAL;
-import static org.apache.xbean.asm5.Opcodes.RETURN;
+import static org.apache.xbean.asm6.Opcodes.ACC_PUBLIC;
+import static org.apache.xbean.asm6.Opcodes.ACC_SUPER;
+import static org.apache.xbean.asm6.Opcodes.ALOAD;
+import static org.apache.xbean.asm6.Opcodes.INVOKESPECIAL;
+import static org.apache.xbean.asm6.Opcodes.RETURN;
 
 /**
  * @version $Rev$ $Date$

http://git-wip-us.apache.org/repos/asf/tomee/blob/91c84e14/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 3c75490..ad38935 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
@@ -54,8 +54,8 @@ import java.util.Hashtable;
 import java.util.Map;
 import java.util.Properties;
 
-import static org.apache.xbean.asm5.Opcodes.ACC_PRIVATE;
-import static org.apache.xbean.asm5.Opcodes.ACC_TRANSIENT;
+import static org.apache.xbean.asm6.Opcodes.ACC_PRIVATE;
+import static org.apache.xbean.asm6.Opcodes.ACC_TRANSIENT;
 
 public class JpaTest extends TestCase {
 static {