Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft: Try updating xbean-asm #199

Draft
wants to merge 7 commits into
base: tomee-1.7.x-TT.x-release
Choose a base branch
from
Draft

Draft: Try updating xbean-asm #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2285e6f
Try updating xbean-asm
jgallimore Jun 7, 2022
2e937f2
Exclude xbean-asm5-shaded since xbean-asm9-shaded-4.21 is already pro…
cesarhernandezgt Jun 7, 2022
9568e84
Upgrade openwebbeans to 1.2.8-TT.1
cesarhernandezgt Jun 8, 2022
c65d683
Merge branch 'tomee-1.7.x-TT.x-release' into upgrade-xbean-asm
cesarhernandezgt Jun 9, 2022
9ec4ed7
fixed pom
cesarhernandezgt Jun 9, 2022
e540ce9
Upgraded to jpa 2.4.3-TT.1
cesarhernandezgt Jul 30, 2022
35e530e
upgraded to cxf 2.6.17-TT.9
cesarhernandezgt Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arquillian/arquillian-tomee-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
<groupId>org.apache.geronimo.javamail</groupId>
</exclusion>
<exclusion>
<artifactId>xbean-asm5-shaded</artifactId>
<artifactId>xbean-asm9-shaded</artifactId>
<groupId>org.apache.xbean</groupId>
</exclusion>
<exclusion>
Expand Down
2 changes: 1 addition & 1 deletion arquillian/arquillian-tomee-webapp-remote/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
<groupId>org.apache.geronimo.javamail</groupId>
</exclusion>
<exclusion>
<artifactId>xbean-asm5-shaded</artifactId>
<artifactId>xbean-asm9-shaded</artifactId>
<groupId>org.apache.xbean</groupId>
</exclusion>
<exclusion>
Expand Down
8 changes: 4 additions & 4 deletions container/openejb-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down Expand Up @@ -384,7 +384,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-asm9-shaded-${xbeanVersion}.jar
</Class-Path>
<J2EE-DeploymentFactory-Implementation-Class>
org.apache.openejb.config.VmDeploymentFactory
Expand Down Expand Up @@ -536,7 +536,7 @@
<!-- End: JavaMail -->
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm5-shaded</artifactId>
<artifactId>xbean-asm9-shaded</artifactId>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
Expand Down
12 changes: 6 additions & 6 deletions ...er/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...iner/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions ...ainer/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 10 additions & 10 deletions container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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$
Expand Down
8 changes: 4 additions & 4 deletions ...ner/openejb-core/src/test/java/org/apache/openejb/config/rules/KeysAnnotationVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion container/openejb-jpa-integration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm5-shaded</artifactId>
<artifactId>xbean-asm9-shaded</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
10 changes: 5 additions & 5 deletions ...penejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions examples/deltaspike-fullstack/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<groupId>org.slf4j</groupId>
</exclusion>
<exclusion>
<artifactId>xbean-asm5-shaded</artifactId>
<artifactId>xbean-asm9-shaded</artifactId>
<groupId>org.apache.xbean</groupId>
</exclusion>
<exclusion>
Expand All @@ -119,8 +119,8 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm5-shaded</artifactId>
<version>3.18</version>
<artifactId>xbean-asm9-shaded</artifactId>
<version>4.21</version>
</dependency>
<dependency>
<artifactId>commons-lang3</artifactId>
Expand Down
Loading