Repository: tomee Updated Branches: refs/heads/master f8764fe69 -> 53e21ef3f
move to asm6 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/65a131e4 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/65a131e4 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/65a131e4 Branch: refs/heads/master Commit: 65a131e46fe18ef3ae72390499c9222409044a01 Parents: 613c847 Author: Mark Struberg <strub...@apache.org> Authored: Thu Feb 15 22:59:24 2018 +0100 Committer: Jonathan Gallimore <j...@jrg.me.uk> Committed: Mon Feb 19 13:47:16 2018 +0000 ---------------------------------------------------------------------- arquillian/arquillian-tomee-common/pom.xml | 2 +- .../arquillian-tomee-webapp-remote/pom.xml | 2 +- container/openejb-core/pom.xml | 4 ++-- .../config/PersistenceContextAnnFactory.java | 12 ++++++------ .../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 | 14 +++++++------- .../apache/openejb/util/AnnotationFinder.java | 14 +++++++------- .../util/proxy/LocalBeanProxyFactory.java | 10 +++++----- .../openejb/DependenceValidationTest.java | 4 ++-- .../org/apache/openejb/DependencyVisitor.java | 20 ++++++++++---------- .../openejb/config/ServiceClasspathTest.java | 6 +++--- .../config/rules/KeysAnnotationVisitor.java | 8 ++++---- .../config/rules/ValidationKeysAuditorTest.java | 4 ++-- .../apache/openejb/core/cmp/jpa/JpaTest.java | 8 ++++---- container/openejb-jpa-integration/pom.xml | 2 +- .../openejb/jpa/integration/MakeTxLookup.java | 10 +++++----- pom.xml | 4 ++-- server/openejb-server/pom.xml | 2 +- tomee/apache-tomee/pom.xml | 2 +- 25 files changed, 85 insertions(+), 85 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/arquillian/arquillian-tomee-common/pom.xml ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml index 2308bf7..a45d771 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-asm5-shaded</artifactId> + <artifactId>xbean-asm6-shaded</artifactId> <groupId>org.apache.xbean</groupId> </exclusion> <exclusion> http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 ccfbaa3..534745a 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-asm5-shaded</artifactId> + <artifactId>xbean-asm6-shaded</artifactId> <groupId>org.apache.xbean</groupId> </exclusion> <exclusion> http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/container/openejb-core/pom.xml ---------------------------------------------------------------------- diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml index be1e710..3655f3b 100644 --- a/container/openejb-core/pom.xml +++ b/container/openejb-core/pom.xml @@ -399,7 +399,7 @@ </manifest> <manifestEntries> <Class-Path>openejb-loader-${project.version}.jar openejb-client-${project.version}.jar - xbean-finder-shaded-${xbeanVersion}.jar xbean-asm5-shaded-${xbeanVersion}.jar + xbean-finder-shaded-${xbeanVersion}.jar xbean-asm6-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-asm5-shaded</artifactId> + <artifactId>xbean-asm6-shaded</artifactId> </dependency> <dependency> <groupId>org.apache.xbean</groupId> http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 ee9671c..12adae1 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.asm5.AnnotationVisitor; -import org.apache.xbean.asm5.ClassReader; -import org.apache.xbean.asm5.FieldVisitor; -import org.apache.xbean.asm5.MethodVisitor; -import org.apache.xbean.asm5.Opcodes; -import org.apache.xbean.asm5.shade.commons.EmptyVisitor; +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 javax.persistence.PersistenceContext; import javax.persistence.PersistenceProperty; http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 c2aa097..782bd89 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.asm5.ClassReader; -import org.apache.xbean.asm5.Opcodes; -import org.apache.xbean.asm5.shade.commons.EmptyVisitor; +import org.apache.xbean.asm6.ClassReader; +import org.apache.xbean.asm6.Opcodes; +import org.apache.xbean.asm6.shade.commons.EmptyVisitor; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 2ebe673..d8ec702 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.asm5.ClassWriter; -import org.apache.xbean.asm5.FieldVisitor; -import org.apache.xbean.asm5.MethodVisitor; -import org.apache.xbean.asm5.Opcodes; -import org.apache.xbean.asm5.Type; +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; /** * Class for generating a class file that implements http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 6b48711..1842310 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.asm5.ClassWriter; -import org.apache.xbean.asm5.FieldVisitor; -import org.apache.xbean.asm5.Label; -import org.apache.xbean.asm5.MethodVisitor; -import org.apache.xbean.asm5.Opcodes; -import org.apache.xbean.asm5.Type; +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 javax.ejb.EntityContext; import java.lang.reflect.Field; http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 246c70e..133316e 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.asm5.Type; +import org.apache.xbean.asm6.Type; import java.lang.reflect.Method; http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 113eb8c..0021cd0 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.asm5.Type; +import org.apache.xbean.asm6.Type; public class CmrField { private final String name; http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 a33f424..5be1425 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.asm5.Type; +import org.apache.xbean.asm6.Type; import java.lang.reflect.Method; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 d5872d8..eab5aa1 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.asm5.ClassWriter; -import org.apache.xbean.asm5.MethodVisitor; -import org.apache.xbean.asm5.Opcodes; -import org.apache.xbean.asm5.Type; +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 java.lang.reflect.Method; import java.lang.reflect.Modifier; http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 7ce6934..fc0ff9a 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.asm5.AnnotationVisitor; -import org.apache.xbean.asm5.ClassReader; -import org.apache.xbean.asm5.ClassVisitor; -import org.apache.xbean.asm5.ClassWriter; -import org.apache.xbean.asm5.MethodVisitor; -import org.apache.xbean.asm5.Opcodes; -import org.apache.xbean.asm5.Type; +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 java.io.ByteArrayOutputStream; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 cf0d519..eb4587c 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.asm5.AnnotationVisitor; -import org.apache.xbean.asm5.Attribute; -import org.apache.xbean.asm5.ClassReader; -import org.apache.xbean.asm5.ClassVisitor; -import org.apache.xbean.asm5.FieldVisitor; -import org.apache.xbean.asm5.MethodVisitor; -import org.apache.xbean.asm5.Opcodes; +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.finder.UrlSet; import java.io.BufferedInputStream; http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 9a56db7..8a0dd8a 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.asm5.ClassWriter; -import org.apache.xbean.asm5.Label; -import org.apache.xbean.asm5.MethodVisitor; -import org.apache.xbean.asm5.Opcodes; -import org.apache.xbean.asm5.Type; +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 javax.ejb.EJBException; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 37d70e9..2436960 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.asm5.ClassReader; -import org.apache.xbean.asm5.ClassWriter; +import org.apache.xbean.asm6.ClassReader; +import org.apache.xbean.asm6.ClassWriter; import java.io.File; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 3e3a199..fcaa6f8 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.asm5.AnnotationVisitor; -import org.apache.xbean.asm5.Attribute; -import org.apache.xbean.asm5.FieldVisitor; -import org.apache.xbean.asm5.Label; -import org.apache.xbean.asm5.MethodVisitor; -import org.apache.xbean.asm5.Opcodes; -import org.apache.xbean.asm5.Type; -import org.apache.xbean.asm5.shade.commons.EmptyVisitor; -import org.apache.xbean.asm5.signature.SignatureReader; -import org.apache.xbean.asm5.signature.SignatureVisitor; +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 java.util.HashMap; import java.util.HashSet; http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 7f35b48..a8b59dc 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.asm5.ClassWriter; -import org.apache.xbean.asm5.MethodVisitor; -import org.apache.xbean.asm5.Opcodes; +import org.apache.xbean.asm6.ClassWriter; +import org.apache.xbean.asm6.MethodVisitor; +import org.apache.xbean.asm6.Opcodes; import org.junit.After; import org.junit.Assert; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 ef7ae42..57d1160 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.asm5.AnnotationVisitor; -import org.apache.xbean.asm5.MethodVisitor; -import org.apache.xbean.asm5.Type; -import org.apache.xbean.asm5.shade.commons.EmptyVisitor; +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 java.util.HashSet; http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 4732338..dca0df0 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.asm5.ClassReader; -import org.apache.xbean.asm5.ClassWriter; +import org.apache.xbean.asm6.ClassReader; +import org.apache.xbean.asm6.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/65a131e4/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 a9c38a9..c194edc 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.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 org.apache.xbean.naming.context.ImmutableContext; import javax.naming.Context; http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/container/openejb-jpa-integration/pom.xml ---------------------------------------------------------------------- diff --git a/container/openejb-jpa-integration/pom.xml b/container/openejb-jpa-integration/pom.xml index 69ad40e..43de9a9 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-asm5-shaded</artifactId> + <artifactId>xbean-asm6-shaded</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/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 23a1951..d3d9c3d 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.asm5.ClassWriter; -import org.apache.xbean.asm5.Label; -import org.apache.xbean.asm5.MethodVisitor; -import org.apache.xbean.asm5.Opcodes; -import org.apache.xbean.asm5.Type; +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 java.io.File; import java.io.FileOutputStream; http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 58581b8..0fc7f2e 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ <maven-bundle-plugin.version>3.3.0</maven-bundle-plugin.version> <!-- This is used by a manifest classpath entry --> - <xbeanVersion>4.5</xbeanVersion> + <xbeanVersion>4.6</xbeanVersion> <!-- OSGi bundles properties --> <openejb.bundle.activator/> @@ -1244,7 +1244,7 @@ </dependency> <dependency> <groupId>org.apache.xbean</groupId> - <artifactId>xbean-asm5-shaded</artifactId> + <artifactId>xbean-asm6-shaded</artifactId> <version>${xbeanVersion}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/server/openejb-server/pom.xml ---------------------------------------------------------------------- diff --git a/server/openejb-server/pom.xml b/server/openejb-server/pom.xml index 693a981..7b0afb6 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-asm5-shaded</artifactId> + <artifactId>xbean-asm6-shaded</artifactId> </dependency> <dependency> <groupId>org.apache.xbean</groupId> http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/tomee/apache-tomee/pom.xml ---------------------------------------------------------------------- diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml index e394920..9cc3790 100644 --- a/tomee/apache-tomee/pom.xml +++ b/tomee/apache-tomee/pom.xml @@ -254,7 +254,7 @@ </dependency> <dependency> <groupId>org.apache.xbean</groupId> - <artifactId>xbean-asm5-shaded</artifactId> + <artifactId>xbean-asm6-shaded</artifactId> <version>${xbeanVersion}</version> </dependency> <dependency>