From 2285e6f88de8a4347fd75f0f39f369cbce75a52a Mon Sep 17 00:00:00 2001 From: Jonathan Gallimore Date: Tue, 7 Jun 2022 14:29:08 +0100 Subject: [PATCH 1/6] Try updating xbean-asm --- 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 +++++------ .../openejb/core/cmp/cmp2/CmpField.java | 2 +- .../openejb/core/cmp/cmp2/CmrField.java | 2 +- .../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 | 16 +++++++-------- .../config/rules/KeysAnnotationVisitor.java | 8 ++++---- .../rules/ValidationKeysAuditorTest.java | 4 ++-- .../apache/openejb/core/cmp/jpa/JpaTest.java | 12 +++++------ container/openejb-jpa-integration/pom.xml | 2 +- .../openejb/jpa/integration/MakeTxLookup.java | 10 +++++----- examples/deltaspike-fullstack/pom.xml | 6 +++--- pom.xml | 4 ++-- server/openejb-server/pom.xml | 2 +- 25 files changed, 94 insertions(+), 94 deletions(-) diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml index ebec3f80549..20c2dc24540 100644 --- a/arquillian/arquillian-tomee-common/pom.xml +++ b/arquillian/arquillian-tomee-common/pom.xml @@ -150,7 +150,7 @@ org.apache.geronimo.javamail - xbean-asm5-shaded + xbean-asm9-shaded org.apache.xbean diff --git a/arquillian/arquillian-tomee-webapp-remote/pom.xml b/arquillian/arquillian-tomee-webapp-remote/pom.xml index cbd96c87b81..052668f10b7 100644 --- a/arquillian/arquillian-tomee-webapp-remote/pom.xml +++ b/arquillian/arquillian-tomee-webapp-remote/pom.xml @@ -169,7 +169,7 @@ org.apache.geronimo.javamail - xbean-asm5-shaded + xbean-asm9-shaded org.apache.xbean diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml index df3cc967379..d8ee82b19d2 100644 --- a/container/openejb-core/pom.xml +++ b/container/openejb-core/pom.xml @@ -384,7 +384,7 @@ 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-asm9-shaded-${xbeanVersion}.jar org.apache.openejb.config.VmDeploymentFactory @@ -536,7 +536,7 @@ org.apache.xbean - xbean-asm5-shaded + xbean-asm9-shaded org.apache.xbean 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 41330707737..e2cbda2840f 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 @@ 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.asm9.AnnotationVisitor; +import org.apache.xbean.asm9.ClassReader; +import org.apache.xbean.asm9.FieldVisitor; +import org.apache.xbean.asm9.MethodVisitor; +import org.apache.xbean.asm9.Opcodes; +import org.apache.xbean.asm9.shade.commons.EmptyVisitor; import javax.persistence.PersistenceContext; import javax.persistence.PersistenceProperty; 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 ea7df2bbeab..40904522332 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 @@ 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.asm9.ClassReader; +import org.apache.xbean.asm9.Opcodes; +import org.apache.xbean.asm9.shade.commons.EmptyVisitor; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; 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 3af5d9d27c6..62001b9c3b5 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.asm9.ClassWriter; +import org.apache.xbean.asm9.FieldVisitor; +import org.apache.xbean.asm9.MethodVisitor; +import org.apache.xbean.asm9.Opcodes; +import org.apache.xbean.asm9.Type; /** * Class for generating a class file that implements 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 29005e392b2..ad76667e6c3 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.asm9.ClassWriter; +import org.apache.xbean.asm9.FieldVisitor; +import org.apache.xbean.asm9.Label; +import org.apache.xbean.asm9.MethodVisitor; +import org.apache.xbean.asm9.Opcodes; +import org.apache.xbean.asm9.Type; import javax.ejb.EntityContext; import java.lang.reflect.Field; 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 246c70e6c50..e91208715b8 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.asm9.Type; import java.lang.reflect.Method; 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 113eb8c5e61..1559e9d373d 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.asm9.Type; public class CmrField { private final String name; 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 a33f424c852..08648e0203c 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.asm9.Type; import java.lang.reflect.Method; import java.util.Collection; 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 d5872d87edd..fbff0bc0214 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.asm9.ClassWriter; +import org.apache.xbean.asm9.MethodVisitor; +import org.apache.xbean.asm9.Opcodes; +import org.apache.xbean.asm9.Type; import java.lang.reflect.Method; import java.lang.reflect.Modifier; 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 507d80de80a..a8444edd6cc 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.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.asm9.AnnotationVisitor; +import org.apache.xbean.asm9.ClassReader; +import org.apache.xbean.asm9.ClassVisitor; +import org.apache.xbean.asm9.ClassWriter; +import org.apache.xbean.asm9.MethodVisitor; +import org.apache.xbean.asm9.Opcodes; +import org.apache.xbean.asm9.Type; import java.io.ByteArrayOutputStream; import java.io.IOException; 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 1595ba2052a..2204ccdab83 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.asm9.AnnotationVisitor; +import org.apache.xbean.asm9.Attribute; +import org.apache.xbean.asm9.ClassReader; +import org.apache.xbean.asm9.ClassVisitor; +import org.apache.xbean.asm9.FieldVisitor; +import org.apache.xbean.asm9.MethodVisitor; +import org.apache.xbean.asm9.Opcodes; import org.apache.xbean.finder.UrlSet; import java.io.BufferedInputStream; 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 5934a3816cc..72002458d64 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.asm9.ClassWriter; +import org.apache.xbean.asm9.Label; +import org.apache.xbean.asm9.MethodVisitor; +import org.apache.xbean.asm9.Opcodes; +import org.apache.xbean.asm9.Type; import javax.ejb.EJBException; import java.io.Serializable; 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 72c742ede79..db6f8a7f345 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.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.asm9.ClassReader; +import org.apache.xbean.asm9.ClassWriter; import java.io.File; import java.io.IOException; 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 3e3a1997ce2..0703fb5b5aa 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.asm9.AnnotationVisitor; +import org.apache.xbean.asm9.Attribute; +import org.apache.xbean.asm9.FieldVisitor; +import org.apache.xbean.asm9.Label; +import org.apache.xbean.asm9.MethodVisitor; +import org.apache.xbean.asm9.Opcodes; +import org.apache.xbean.asm9.Type; +import org.apache.xbean.asm9.shade.commons.EmptyVisitor; +import org.apache.xbean.asm9.signature.SignatureReader; +import org.apache.xbean.asm9.signature.SignatureVisitor; import java.util.HashMap; import java.util.HashSet; 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 a09e18d559c..17f362c0667 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 @@ -28,9 +28,9 @@ import org.apache.openejb.loader.SystemInstance; 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.asm9.ClassWriter; +import org.apache.xbean.asm9.MethodVisitor; +import org.apache.xbean.asm9.Opcodes; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -52,11 +52,11 @@ 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.asm9.Opcodes.ACC_PUBLIC; +import static org.apache.xbean.asm9.Opcodes.ACC_SUPER; +import static org.apache.xbean.asm9.Opcodes.ALOAD; +import static org.apache.xbean.asm9.Opcodes.INVOKESPECIAL; +import static org.apache.xbean.asm9.Opcodes.RETURN; /** * @version $Rev$ $Date$ 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 ef7ae42462e..5b90ca8cb22 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.asm9.AnnotationVisitor; +import org.apache.xbean.asm9.MethodVisitor; +import org.apache.xbean.asm9.Type; +import org.apache.xbean.asm9.shade.commons.EmptyVisitor; import java.util.HashSet; 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 473233874ff..5a2315f72a9 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 @@ 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.asm9.ClassReader; +import org.apache.xbean.asm9.ClassWriter; import org.codehaus.swizzle.confluence.Confluence; import org.codehaus.swizzle.confluence.Page; import org.junit.BeforeClass; 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 b8ba0f48eb4..869b525d426 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.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.asm9.ClassReader; +import org.apache.xbean.asm9.ClassVisitor; +import org.apache.xbean.asm9.ClassWriter; +import org.apache.xbean.asm9.Opcodes; import org.apache.xbean.naming.context.ImmutableContext; import javax.naming.Context; @@ -54,8 +54,8 @@ 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.asm9.Opcodes.ACC_PRIVATE; +import static org.apache.xbean.asm9.Opcodes.ACC_TRANSIENT; public class JpaTest extends TestCase { diff --git a/container/openejb-jpa-integration/pom.xml b/container/openejb-jpa-integration/pom.xml index 92fd78dbf6f..e6fa9b0554b 100644 --- a/container/openejb-jpa-integration/pom.xml +++ b/container/openejb-jpa-integration/pom.xml @@ -31,7 +31,7 @@ org.apache.xbean - xbean-asm5-shaded + xbean-asm9-shaded provided 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 b03ec9266f5..68a5b86deb6 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.asm9.ClassWriter; +import org.apache.xbean.asm9.Label; +import org.apache.xbean.asm9.MethodVisitor; +import org.apache.xbean.asm9.Opcodes; +import org.apache.xbean.asm9.Type; import java.io.File; import java.io.FileOutputStream; diff --git a/examples/deltaspike-fullstack/pom.xml b/examples/deltaspike-fullstack/pom.xml index 5f5d19caafd..cff0f6285be 100644 --- a/examples/deltaspike-fullstack/pom.xml +++ b/examples/deltaspike-fullstack/pom.xml @@ -100,7 +100,7 @@ org.slf4j - xbean-asm5-shaded + xbean-asm9-shaded org.apache.xbean @@ -119,8 +119,8 @@ org.apache.xbean - xbean-asm5-shaded - 3.18 + xbean-asm9-shaded + 4.21 commons-lang3 diff --git a/pom.xml b/pom.xml index c86026f9b49..b723b09444c 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ 2.3.7 - 4.5 + 4.21 @@ -1689,7 +1689,7 @@ org.apache.xbean - xbean-asm5-shaded + xbean-asm9-shaded ${xbeanVersion} diff --git a/server/openejb-server/pom.xml b/server/openejb-server/pom.xml index c9f943e5591..7e50785a708 100644 --- a/server/openejb-server/pom.xml +++ b/server/openejb-server/pom.xml @@ -84,7 +84,7 @@ org.apache.xbean - xbean-asm5-shaded + xbean-asm9-shaded org.apache.xbean From 2e937f258874d0240ec5148e92680dc0bc9358cd Mon Sep 17 00:00:00 2001 From: Cesar Hernandez Date: Tue, 7 Jun 2022 16:05:13 -0600 Subject: [PATCH 2/6] Exclude xbean-asm5-shaded since xbean-asm9-shaded-4.21 is already provided --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index b723b09444c..256efef6b8a 100644 --- a/pom.xml +++ b/pom.xml @@ -1636,6 +1636,10 @@ commons-pool commons-pool + + org.apache.xbean + xbean-asm5-shaded + @@ -1946,6 +1950,10 @@ org.apache.xbean xbean-finder-shaded + + org.apache.xbean + xbean-asm5-shaded + From 9568e84f6faf2cc37b898f1fb729d3aa3f9822b0 Mon Sep 17 00:00:00 2001 From: Cesar Hernandez Date: Wed, 8 Jun 2022 16:36:25 -0600 Subject: [PATCH 3/6] Upgrade openwebbeans to 1.2.8-TT.1 --- container/openejb-core/pom.xml | 4 ++-- pom.xml | 10 +--------- server/openejb-server/pom.xml | 4 ++-- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml index d8ee82b19d2..77a7efb1ea6 100644 --- a/container/openejb-core/pom.xml +++ b/container/openejb-core/pom.xml @@ -192,8 +192,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.asm5;version="[3.1,5)", - org.apache.xbean.asm5.commons;version="[3.1,5)", + org.apache.xbean.asm9;version="[3.1,5)", + org.apache.xbean.asm9.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)", diff --git a/pom.xml b/pom.xml index 256efef6b8a..db977e9cf1e 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ 1.7.6-SNAPSHOT 2.4.2 - 1.2.8 + 1.2.8-TT.1 2.3.7 @@ -1636,10 +1636,6 @@ commons-pool commons-pool - - org.apache.xbean - xbean-asm5-shaded - @@ -1950,10 +1946,6 @@ org.apache.xbean xbean-finder-shaded - - org.apache.xbean - xbean-asm5-shaded - diff --git a/server/openejb-server/pom.xml b/server/openejb-server/pom.xml index 7e50785a708..a5ebaaec824 100644 --- a/server/openejb-server/pom.xml +++ b/server/openejb-server/pom.xml @@ -272,8 +272,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.asm5;version="[3.1,4)", - org.apache.xbean.asm5.commons;version="[3.1,4)", + org.apache.xbean.asm9;version="[3.1,4)", + org.apache.xbean.asm9.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)", From 9ec4ed784ace4899b56722188d4a2ce95fe9ffe5 Mon Sep 17 00:00:00 2001 From: Cesar Hernandez Date: Thu, 9 Jun 2022 15:16:26 -0600 Subject: [PATCH 4/6] fixed pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c86dd03b85d..822c8d2c573 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ 0 false 4.7.6-TT.28 - 1.7.6-TT.281.7.6-TT.28 2.4.3 1.2.8-TT.1 From e540ce9a2c5ca299f0fbec9307aad7496f1b2a5d Mon Sep 17 00:00:00 2001 From: Cesar Hernandez Date: Fri, 29 Jul 2022 20:04:10 -0600 Subject: [PATCH 5/6] Upgraded to jpa 2.4.3-TT.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 822c8d2c573..c6d8882abb3 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ false 4.7.6-TT.28 1.7.6-TT.28 - 2.4.3 + 2.4.3-TT.1 1.2.8-TT.1 From 35e530ecc8191f4e107ab3fd56652c3a0b7cd82f Mon Sep 17 00:00:00 2001 From: Cesar Hernandez Date: Mon, 1 Aug 2022 16:51:15 -0600 Subject: [PATCH 6/6] upgraded to cxf 2.6.17-TT.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c6d8882abb3..74bee7ad3dc 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ 7.0.109-TT.2 - 2.6.17-TT.8 + 2.6.17-TT.9 2.6.8