tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlmonte...@apache.org
Subject [1/2] tomee git commit: TOMEE-2272 XBean upgrade for Java 11 support
Date Mon, 12 Nov 2018 11:03:12 GMT
Repository: tomee
Updated Branches:
  refs/heads/master 3e3f59df0 -> b880351b4


TOMEE-2272 XBean upgrade for Java 11 support


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

Branch: refs/heads/master
Commit: 14919e15178e6f45254da74d3574dcb9312c54a1
Parents: 1217e64
Author: Jean-Louis Monteiro <jeanouii@gmail.com>
Authored: Mon Nov 12 11:59:18 2018 +0100
Committer: Jean-Louis Monteiro <jeanouii@gmail.com>
Committed: Mon Nov 12 11:59:18 2018 +0100

----------------------------------------------------------------------
 arquillian/arquillian-tomee-common/pom.xml      |  2 +-
 .../arquillian-tomee-webapp-remote/pom.xml      |  2 +-
 container/openejb-core/pom.xml                  |  8 +++----
 .../config/PersistenceContextAnnFactory.java    | 14 ++++++-------
 .../apache/openejb/core/TempClassLoader.java    |  6 +++---
 .../openejb/core/cmp/cmp2/Cmp1Generator.java    | 10 ++++-----
 .../openejb/core/cmp/cmp2/Cmp2Generator.java    | 12 +++++------
 .../apache/openejb/core/cmp/cmp2/CmpField.java  |  2 +-
 .../apache/openejb/core/cmp/cmp2/CmrField.java  |  2 +-
 .../apache/openejb/core/cmp/cmp2/CmrStyle.java  |  2 +-
 .../core/cmp/cmp2/PostCreateGenerator.java      |  8 +++----
 .../apache/openejb/dyni/DynamicSubclass.java    | 20 +++++++++---------
 .../apache/openejb/util/AnnotationFinder.java   | 16 +++++++-------
 .../util/proxy/LocalBeanProxyFactory.java       | 10 ++++-----
 .../openejb/DependenceValidationTest.java       |  4 ++--
 .../org/apache/openejb/DependencyVisitor.java   | 22 ++++++++++----------
 .../openejb/config/ServiceClasspathTest.java    | 16 +++++++-------
 .../config/rules/KeysAnnotationVisitor.java     |  8 +++----
 .../config/rules/ValidationKeysAuditorTest.java |  4 ++--
 .../apache/openejb/core/cmp/jpa/JpaTest.java    | 14 ++++++-------
 container/openejb-jpa-integration/pom.xml       |  2 +-
 .../openejb/jpa/integration/MakeTxLookup.java   | 10 ++++-----
 examples/deltaspike-fullstack/pom.xml           |  6 +++---
 pom.xml                                         |  6 +++---
 server/openejb-server/pom.xml                   |  6 +++---
 tomee/apache-tomee/pom.xml                      |  2 +-
 26 files changed, 107 insertions(+), 107 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/arquillian/arquillian-tomee-common/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml
index b18f869..ee0ba0d 100644
--- a/arquillian/arquillian-tomee-common/pom.xml
+++ b/arquillian/arquillian-tomee-common/pom.xml
@@ -151,7 +151,7 @@
           <groupId>org.apache.geronimo.javamail</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>xbean-asm6-shaded</artifactId>
+          <artifactId>xbean-asm7-shaded</artifactId>
           <groupId>org.apache.xbean</groupId>
         </exclusion>
         <exclusion>

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/arquillian/arquillian-tomee-webapp-remote/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-webapp-remote/pom.xml b/arquillian/arquillian-tomee-webapp-remote/pom.xml
index db0fda8..24548cf 100644
--- a/arquillian/arquillian-tomee-webapp-remote/pom.xml
+++ b/arquillian/arquillian-tomee-webapp-remote/pom.xml
@@ -170,7 +170,7 @@
           <groupId>org.apache.geronimo.javamail</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>xbean-asm6-shaded</artifactId>
+          <artifactId>xbean-asm7-shaded</artifactId>
           <groupId>org.apache.xbean</groupId>
         </exclusion>
         <exclusion>

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/container/openejb-core/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 98ab688..bcd6dd6 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -195,8 +195,8 @@
       org.apache.webbeans.util;version="[1.1,2)",
       org.apache.webbeans.web.context;version="[1.1,2)",
       org.apache.webbeans.xml;version="[1.1,2)",
-      org.apache.xbean.asm6;version="[3.1,5)",
-      org.apache.xbean.asm6.commons;version="[3.1,5)",
+      org.apache.xbean.asm7;version="[3.1,5)",
+      org.apache.xbean.asm7.commons;version="[3.1,5)",
       org.apache.xbean.finder;version="[3.8,4)",
       org.apache.xbean.finder.archive;version="[3.8,4)",
       org.apache.xbean.finder.filter;version="[3.8,4)",
@@ -399,7 +399,7 @@
             </manifest>
             <manifestEntries>
               <Class-Path>openejb-loader-${project.version}.jar openejb-client-${project.version}.jar
-                xbean-finder-shaded-${xbeanVersion}.jar xbean-asm6-shaded-${xbeanVersion}.jar
+                xbean-finder-shaded-${xbeanVersion}.jar xbean-asm7-shaded-${xbeanVersion}.jar
               </Class-Path>
               <J2EE-DeploymentFactory-Implementation-Class>
                 org.apache.openejb.config.VmDeploymentFactory
@@ -558,7 +558,7 @@
     <!-- End: JavaMail -->
     <dependency>
       <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-asm6-shaded</artifactId>
+      <artifactId>xbean-asm7-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.xbean</groupId>

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/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 66e2361..5671df4 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
@@ -19,12 +19,12 @@ package org.apache.openejb.config;
 
 import org.apache.openejb.OpenEJBException;
 import org.apache.openejb.loader.IO;
-import org.apache.xbean.asm6.AnnotationVisitor;
-import org.apache.xbean.asm6.ClassReader;
-import org.apache.xbean.asm6.FieldVisitor;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Opcodes;
-import org.apache.xbean.asm6.shade.commons.EmptyVisitor;
+import org.apache.xbean.asm7.AnnotationVisitor;
+import org.apache.xbean.asm7.ClassReader;
+import org.apache.xbean.asm7.FieldVisitor;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
+import org.apache.xbean.asm7.shade.commons.EmptyVisitor;
 
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceProperty;
@@ -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.ASM6);
+            super(Opcodes.ASM7);
             this.contexts = contexts;
             persistenceContext.name = className + "/" + memberName;
         }

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
b/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
index 782bd89..393bfe6 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
@@ -20,9 +20,9 @@ package org.apache.openejb.core;
 import org.apache.openejb.loader.IO;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.util.classloader.URLClassLoaderFirst;
-import org.apache.xbean.asm6.ClassReader;
-import org.apache.xbean.asm6.Opcodes;
-import org.apache.xbean.asm6.shade.commons.EmptyVisitor;
+import org.apache.xbean.asm7.ClassReader;
+import org.apache.xbean.asm7.Opcodes;
+import org.apache.xbean.asm7.shade.commons.EmptyVisitor;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
index d8ec702..36d6fb1 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
@@ -17,11 +17,11 @@
 
 package org.apache.openejb.core.cmp.cmp2;
 
-import org.apache.xbean.asm6.ClassWriter;
-import org.apache.xbean.asm6.FieldVisitor;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Opcodes;
-import org.apache.xbean.asm6.Type;
+import org.apache.xbean.asm7.ClassWriter;
+import org.apache.xbean.asm7.FieldVisitor;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
+import org.apache.xbean.asm7.Type;
 
 /**
  * Class for generating a class file that implements

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
index 1842310..80d447a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
@@ -18,12 +18,12 @@
 package org.apache.openejb.core.cmp.cmp2;
 
 import org.apache.openejb.OpenEJBRuntimeException;
-import org.apache.xbean.asm6.ClassWriter;
-import org.apache.xbean.asm6.FieldVisitor;
-import org.apache.xbean.asm6.Label;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Opcodes;
-import org.apache.xbean.asm6.Type;
+import org.apache.xbean.asm7.ClassWriter;
+import org.apache.xbean.asm7.FieldVisitor;
+import org.apache.xbean.asm7.Label;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
+import org.apache.xbean.asm7.Type;
 
 import javax.ejb.EntityContext;
 import java.lang.reflect.Field;

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
index 133316e..76065b9 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
@@ -17,7 +17,7 @@
 
 package org.apache.openejb.core.cmp.cmp2;
 
-import org.apache.xbean.asm6.Type;
+import org.apache.xbean.asm7.Type;
 
 import java.lang.reflect.Method;
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java
b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java
index 0021cd0..12c03d1 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java
@@ -17,7 +17,7 @@
 
 package org.apache.openejb.core.cmp.cmp2;
 
-import org.apache.xbean.asm6.Type;
+import org.apache.xbean.asm7.Type;
 
 public class CmrField {
     private final String name;

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
index 5be1425..56ee29a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
@@ -17,7 +17,7 @@
 
 package org.apache.openejb.core.cmp.cmp2;
 
-import org.apache.xbean.asm6.Type;
+import org.apache.xbean.asm7.Type;
 
 import java.lang.reflect.Method;
 import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
index eab5aa1..97e602d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
@@ -17,10 +17,10 @@
 
 package org.apache.openejb.core.cmp.cmp2;
 
-import org.apache.xbean.asm6.ClassWriter;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Opcodes;
-import org.apache.xbean.asm6.Type;
+import org.apache.xbean.asm7.ClassWriter;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
+import org.apache.xbean.asm7.Type;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/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 c9dd53b..7cc0284 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
@@ -21,13 +21,13 @@ import org.apache.openejb.loader.IO;
 import org.apache.openejb.util.Debug;
 import org.apache.openejb.util.proxy.LocalBeanProxyFactory;
 import org.apache.openejb.util.proxy.ProxyGenerationException;
-import org.apache.xbean.asm6.AnnotationVisitor;
-import org.apache.xbean.asm6.ClassReader;
-import org.apache.xbean.asm6.ClassVisitor;
-import org.apache.xbean.asm6.ClassWriter;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Opcodes;
-import org.apache.xbean.asm6.Type;
+import org.apache.xbean.asm7.AnnotationVisitor;
+import org.apache.xbean.asm7.ClassReader;
+import org.apache.xbean.asm7.ClassVisitor;
+import org.apache.xbean.asm7.ClassWriter;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
+import org.apache.xbean.asm7.Type;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -297,7 +297,7 @@ public class DynamicSubclass implements Opcodes {
         private final MethodVisitor newMethod;
 
         public MoveAnnotationsVisitor(final MethodVisitor movedMethod, final MethodVisitor
newMethod) {
-            super(Opcodes.ASM6, movedMethod);
+            super(Opcodes.ASM7, movedMethod);
             this.newMethod = newMethod;
         }
 
@@ -323,7 +323,7 @@ public class DynamicSubclass implements Opcodes {
         private final ClassVisitor newClass;
 
         public CopyClassAnnotations(final ClassVisitor newClass) {
-            super(Opcodes.ASM6);
+            super(Opcodes.ASM7);
             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.ASM6);
+            super(Opcodes.ASM7);
             this.visitors = visitors;
         }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/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 3f29b3a..c3c4f94 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
@@ -18,13 +18,13 @@
 package org.apache.openejb.util;
 
 import org.apache.openejb.config.DeploymentsResolver;
-import org.apache.xbean.asm6.AnnotationVisitor;
-import org.apache.xbean.asm6.Attribute;
-import org.apache.xbean.asm6.ClassReader;
-import org.apache.xbean.asm6.ClassVisitor;
-import org.apache.xbean.asm6.FieldVisitor;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Opcodes;
+import org.apache.xbean.asm7.AnnotationVisitor;
+import org.apache.xbean.asm7.Attribute;
+import org.apache.xbean.asm7.ClassReader;
+import org.apache.xbean.asm7.ClassVisitor;
+import org.apache.xbean.asm7.FieldVisitor;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
 import org.apache.xbean.finder.UrlSet;
 
 import java.io.BufferedInputStream;
@@ -327,7 +327,7 @@ public class AnnotationFinder {
         private final Filter filter;
 
         public Visitor(final Filter filter) {
-            super(Opcodes.ASM6);
+            super(Opcodes.ASM7);
             this.filter = filter;
 
             try {

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
b/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
index 8a0dd8a..68d1272 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
@@ -18,11 +18,11 @@
 package org.apache.openejb.util.proxy;
 
 import org.apache.openejb.util.Debug;
-import org.apache.xbean.asm6.ClassWriter;
-import org.apache.xbean.asm6.Label;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Opcodes;
-import org.apache.xbean.asm6.Type;
+import org.apache.xbean.asm7.ClassWriter;
+import org.apache.xbean.asm7.Label;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
+import org.apache.xbean.asm7.Type;
 
 import javax.ejb.EJBException;
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
b/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
index 2436960..965c77b 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
@@ -20,8 +20,8 @@ import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 import junit.framework.TestResult;
 import org.apache.openejb.loader.IO;
-import org.apache.xbean.asm6.ClassReader;
-import org.apache.xbean.asm6.ClassWriter;
+import org.apache.xbean.asm7.ClassReader;
+import org.apache.xbean.asm7.ClassWriter;
 
 import java.io.File;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/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 6f8a215..5898626 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
@@ -45,16 +45,16 @@
  */
 package org.apache.openejb;
 
-import org.apache.xbean.asm6.AnnotationVisitor;
-import org.apache.xbean.asm6.Attribute;
-import org.apache.xbean.asm6.FieldVisitor;
-import org.apache.xbean.asm6.Label;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Opcodes;
-import org.apache.xbean.asm6.Type;
-import org.apache.xbean.asm6.shade.commons.EmptyVisitor;
-import org.apache.xbean.asm6.signature.SignatureReader;
-import org.apache.xbean.asm6.signature.SignatureVisitor;
+import org.apache.xbean.asm7.AnnotationVisitor;
+import org.apache.xbean.asm7.Attribute;
+import org.apache.xbean.asm7.FieldVisitor;
+import org.apache.xbean.asm7.Label;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
+import org.apache.xbean.asm7.Type;
+import org.apache.xbean.asm7.shade.commons.EmptyVisitor;
+import org.apache.xbean.asm7.signature.SignatureReader;
+import org.apache.xbean.asm7.signature.SignatureVisitor;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -401,7 +401,7 @@ public class DependencyVisitor extends EmptyVisitor {
         private final DependencyVisitor delegate;
 
         public SignatureAdapter(final DependencyVisitor dependencyVisitor) {
-            super(Opcodes.ASM6);
+            super(Opcodes.ASM7);
             delegate = dependencyVisitor;
         }
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/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 51fd351..f7d8189 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
@@ -29,9 +29,9 @@ import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.loader.provisining.ProvisioningResolver;
 import org.apache.openejb.util.Join;
 import org.apache.openejb.util.PropertyPlaceHolderHelper;
-import org.apache.xbean.asm6.ClassWriter;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Opcodes;
+import org.apache.xbean.asm7.ClassWriter;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -53,11 +53,11 @@ import java.util.Properties;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-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;
+import static org.apache.xbean.asm7.Opcodes.ACC_PUBLIC;
+import static org.apache.xbean.asm7.Opcodes.ACC_SUPER;
+import static org.apache.xbean.asm7.Opcodes.ALOAD;
+import static org.apache.xbean.asm7.Opcodes.INVOKESPECIAL;
+import static org.apache.xbean.asm7.Opcodes.RETURN;
 
 /**
  * @version $Rev$ $Date$

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeysAnnotationVisitor.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeysAnnotationVisitor.java
b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeysAnnotationVisitor.java
index 57d1160..736d7e2 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeysAnnotationVisitor.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeysAnnotationVisitor.java
@@ -16,10 +16,10 @@
  */
 package org.apache.openejb.config.rules;
 
-import org.apache.xbean.asm6.AnnotationVisitor;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Type;
-import org.apache.xbean.asm6.shade.commons.EmptyVisitor;
+import org.apache.xbean.asm7.AnnotationVisitor;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Type;
+import org.apache.xbean.asm7.shade.commons.EmptyVisitor;
 
 import java.util.HashSet;
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java
b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java
index dca0df0..e5d3e1f 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java
@@ -19,8 +19,8 @@ package org.apache.openejb.config.rules;
 import org.apache.openejb.config.rules.KeysAnnotationVisitor.ClassInfo;
 import org.apache.openejb.config.rules.KeysAnnotationVisitor.MethodInfo;
 import org.apache.openejb.loader.IO;
-import org.apache.xbean.asm6.ClassReader;
-import org.apache.xbean.asm6.ClassWriter;
+import org.apache.xbean.asm7.ClassReader;
+import org.apache.xbean.asm7.ClassWriter;
 import org.codehaus.swizzle.confluence.Confluence;
 import org.codehaus.swizzle.confluence.Page;
 import org.junit.BeforeClass;

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/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 ad38935..f813202 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
@@ -26,10 +26,10 @@ import org.apache.openejb.persistence.PersistenceClassLoaderHandler;
 import org.apache.openejb.persistence.PersistenceUnitInfoImpl;
 import org.apache.openejb.resource.jdbc.dbcp.BasicDataSource;
 import org.apache.openejb.resource.jdbc.dbcp.BasicManagedDataSource;
-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 org.apache.xbean.asm7.ClassReader;
+import org.apache.xbean.asm7.ClassVisitor;
+import org.apache.xbean.asm7.ClassWriter;
+import org.apache.xbean.asm7.Opcodes;
 import org.apache.xbean.naming.context.ImmutableContext;
 
 import javax.naming.Context;
@@ -54,8 +54,8 @@ import java.util.Hashtable;
 import java.util.Map;
 import java.util.Properties;
 
-import static org.apache.xbean.asm6.Opcodes.ACC_PRIVATE;
-import static org.apache.xbean.asm6.Opcodes.ACC_TRANSIENT;
+import static org.apache.xbean.asm7.Opcodes.ACC_PRIVATE;
+import static org.apache.xbean.asm7.Opcodes.ACC_TRANSIENT;
 
 public class JpaTest extends TestCase {
     static {
@@ -367,7 +367,7 @@ public class JpaTest extends TestCase {
 
     public static class FieldAdderClassVisitor extends ClassVisitor {
         public FieldAdderClassVisitor(final ClassVisitor classVisitor) {
-            super(Opcodes.ASM6, classVisitor);
+            super(Opcodes.ASM7, classVisitor);
         }
 
         public void visitEnd() {

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/container/openejb-jpa-integration/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jpa-integration/pom.xml b/container/openejb-jpa-integration/pom.xml
index 6208e1c..7d61e0d 100644
--- a/container/openejb-jpa-integration/pom.xml
+++ b/container/openejb-jpa-integration/pom.xml
@@ -33,7 +33,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-asm6-shaded</artifactId>
+      <artifactId>xbean-asm7-shaded</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java
----------------------------------------------------------------------
diff --git a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java
b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java
index d3d9c3d..9005a28 100644
--- a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java
+++ b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java
@@ -16,11 +16,11 @@
  */
 package org.apache.openejb.jpa.integration;
 
-import org.apache.xbean.asm6.ClassWriter;
-import org.apache.xbean.asm6.Label;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Opcodes;
-import org.apache.xbean.asm6.Type;
+import org.apache.xbean.asm7.ClassWriter;
+import org.apache.xbean.asm7.Label;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
+import org.apache.xbean.asm7.Type;
 
 import java.io.File;
 import java.io.FileOutputStream;

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/examples/deltaspike-fullstack/pom.xml
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/pom.xml b/examples/deltaspike-fullstack/pom.xml
index a0494ca..75c8923 100644
--- a/examples/deltaspike-fullstack/pom.xml
+++ b/examples/deltaspike-fullstack/pom.xml
@@ -128,7 +128,7 @@
           <groupId>org.slf4j</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>xbean-asm6-shaded</artifactId>
+          <artifactId>xbean-asm7-shaded</artifactId>
           <groupId>org.apache.xbean</groupId>
         </exclusion>
         <exclusion>
@@ -147,8 +147,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-asm6-shaded</artifactId>
-      <version>4.8</version>
+      <artifactId>xbean-asm7-shaded</artifactId>
+      <version>4.12</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5669211..12b156b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
     <maven-bundle-plugin.version>3.3.0</maven-bundle-plugin.version>
 
     <!-- This is used by a manifest classpath entry -->
-    <xbeanVersion>4.9</xbeanVersion>
+    <xbeanVersion>4.12</xbeanVersion>
 
     <!-- OSGi bundles properties -->
     <openejb.bundle.activator/>
@@ -166,7 +166,7 @@
     <commons-io.version>2.4</commons-io.version>
     <commons-net.version>3.3</commons-net.version>
 
-    <bval.version>2.0.0-SNAPSHOT</bval.version>
+    <bval.version>2.0.0</bval.version>
     <org.apache.activemq.version>5.15.3</org.apache.activemq.version>
     <org.springframework.version>3.1.4.RELEASE</org.springframework.version>
     <junit.version>4.12</junit.version>
@@ -1245,7 +1245,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-asm6-shaded</artifactId>
+        <artifactId>xbean-asm7-shaded</artifactId>
         <version>${xbeanVersion}</version>
       </dependency>
       <dependency>

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/server/openejb-server/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-server/pom.xml b/server/openejb-server/pom.xml
index 47f9c0e..8099ae0 100644
--- a/server/openejb-server/pom.xml
+++ b/server/openejb-server/pom.xml
@@ -85,7 +85,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-asm6-shaded</artifactId>
+      <artifactId>xbean-asm7-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.xbean</groupId>
@@ -273,8 +273,8 @@
       org.apache.webbeans.util;version="[1.1,2)",
       org.apache.webbeans.web.context;version="[1.1,2)",
       org.apache.webbeans.xml;version="[1.1,2)",
-      org.apache.xbean.asm6;version="[3.1,4)",
-      org.apache.xbean.asm6.commons;version="[3.1,4)",
+      org.apache.xbean.asm7;version="[3.1,4)",
+      org.apache.xbean.asm7.commons;version="[3.1,4)",
       org.apache.xbean.finder;version="[3.8,4)",
       org.apache.xbean.finder.archive;version="[3.8,4)",
       org.apache.xbean.finder.filter;version="[3.8,4)",

http://git-wip-us.apache.org/repos/asf/tomee/blob/14919e15/tomee/apache-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index e22b05e..574c562 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -281,7 +281,7 @@
           </dependency>
           <dependency>
             <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-asm6-shaded</artifactId>
+            <artifactId>xbean-asm7-shaded</artifactId>
             <version>${xbeanVersion}</version>
           </dependency>
           <dependency>


Mime
View raw message