[ARIES-2022] Upgrade to ASM 9.1
diff --git a/proxy/proxy-impl/pom.xml b/proxy/proxy-impl/pom.xml
index 9b6d223..7357e8b 100644
--- a/proxy/proxy-impl/pom.xml
+++ b/proxy/proxy-impl/pom.xml
@@ -56,7 +56,7 @@
<aries.osgi.import.pkg>
org.apache.aries.proxy.weavinghook;resolution:=optional;provide:=true,
org.apache.aries.proxy*;provide:=true,
- org.objectweb.asm*;resolution:=optional;version="[5,9)",
+ org.objectweb.asm*;resolution:=optional;version="[5,10)",
sun.reflect*;resolution:=optional,
*
</aries.osgi.import.pkg>
@@ -77,13 +77,13 @@
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<optional>true</optional>
- <version>8.0.1</version>
+ <version>9.1</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<optional>true</optional>
- <version>8.0.1</version>
+ <version>9.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -104,7 +104,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.5</version>
+ <version>2.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -120,13 +120,13 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.5.5</version>
+ <version>3.7.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyAdapter.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyAdapter.java
index 780a3dd..d00a0c4 100644
--- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyAdapter.java
+++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyAdapter.java
@@ -365,7 +365,7 @@
//to write our init code to static_init_UUID instead
staticInitMethod = new Method("static_init_" + UU_ID, Type.VOID_TYPE, NO_ARGS);
staticInitMethodFlags = staticInitMethodFlags | ACC_FINAL;
- methodVisitorToReturn = new AdviceAdapter(Opcodes.ASM8, cv.visitMethod(access, name, desc, signature,
+ methodVisitorToReturn = new AdviceAdapter(Opcodes.ASM9, cv.visitMethod(access, name, desc, signature,
exceptions), access, name, desc){
@Override
protected void onMethodEnter()
diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java
index b77242e..cd518ad 100644
--- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java
+++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java
@@ -179,7 +179,7 @@
String methodStaticFieldName, Method currentTransformMethod, Type typeBeingWoven,
Type methodDeclaringType, boolean isMethodDeclaringTypeInterface, boolean isDefaultMethod)
{
- super(ASM8, mv, access, name, desc);
+ super(ASM9, mv, access, name, desc);
this.methodStaticFieldName = methodStaticFieldName;
this.currentTransformMethod = currentTransformMethod;
returnType = currentTransformMethod.getReturnType();
diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/ConstructorFinder.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/ConstructorFinder.java
index bf6c0a2..71c44f8 100644
--- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/ConstructorFinder.java
+++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/ConstructorFinder.java
@@ -37,7 +37,7 @@
public ConstructorFinder()
{
- super(Opcodes.ASM8);
+ super(Opcodes.ASM9);
}
@Override
diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/MethodCopyingClassAdapter.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/MethodCopyingClassAdapter.java
index 23047e6..4d14254 100644
--- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/MethodCopyingClassAdapter.java
+++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/MethodCopyingClassAdapter.java
@@ -64,7 +64,7 @@
public MethodCopyingClassAdapter(AbstractWovenProxyAdapter awpa, ClassLoader definingLoader,
Class<?> superToCopy, Type overridingClassType, Set<Method> knownMethods,
Map<String, TypeMethod> transformedMethods) {
- super(Opcodes.ASM8);
+ super(Opcodes.ASM9);
this.wovenProxyAdapter = awpa;
this.superToCopy = superToCopy;
this.overridingClassType = overridingClassType;
@@ -178,7 +178,7 @@
public CopyingMethodAdapter(GeneratorAdapter mv, Type superType,
Method currentTransformMethod) {
- super(Opcodes.ASM8);
+ super(Opcodes.ASM9);
this.mv = mv;
this.superType = superType;
this.currentTransformMethod = currentTransformMethod;
diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/OSGiFriendlyClassVisitor.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/OSGiFriendlyClassVisitor.java
index 0a26cfe..a06023e 100644
--- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/OSGiFriendlyClassVisitor.java
+++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/OSGiFriendlyClassVisitor.java
@@ -35,7 +35,7 @@
public OSGiFriendlyClassVisitor(ClassVisitor cv, int arg1) {
- super(Opcodes.ASM8, cv);
+ super(Opcodes.ASM9, cv);
inlineJSR = arg1 == ClassWriter.COMPUTE_FRAMES;
}
diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassAdapter.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassAdapter.java
index f2900e8..5c130e2 100644
--- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassAdapter.java
+++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassAdapter.java
@@ -66,7 +66,7 @@
public ProxySubclassAdapter(ClassVisitor writer, String newClassName, ClassLoader loader)
{
// call the superclass constructor
- super(Opcodes.ASM8, writer);
+ super(Opcodes.ASM9, writer);
// the writer is now the cv in the superclass of ClassAdapter
LOGGER.debug(Constants.LOG_ENTRY, "ProxySubclassAdapter", new Object[] { this, writer,
diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassHierarchyAdapter.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassHierarchyAdapter.java
index c3dc2df..fdbc856 100644
--- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassHierarchyAdapter.java
+++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassHierarchyAdapter.java
@@ -47,7 +47,7 @@
ProxySubclassHierarchyAdapter(ProxySubclassAdapter adapter, Collection<String> methodsToImplement)
{
- super(Opcodes.ASM8);
+ super(Opcodes.ASM9);
LOGGER.debug(Constants.LOG_ENTRY, "ProxySubclassHeirarchyAdapter", new Object[] {
this, adapter, methodsToImplement });
diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceCombiningClassAdapter.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceCombiningClassAdapter.java
index f05bb76..e88c350 100644
--- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceCombiningClassAdapter.java
+++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceCombiningClassAdapter.java
@@ -61,7 +61,7 @@
*/
InterfaceCombiningClassAdapter(String className,
ClassLoader loader, Class<?> superclass, Collection<Class<?>> interfaces) {
- super(Opcodes.ASM8);
+ super(Opcodes.ASM9);
writer = new OSGiFriendlyClassWriter(ClassWriter.COMPUTE_FRAMES, loader);
ClassVisitor cv = new OSGiFriendlyClassVisitor(writer, ClassWriter.COMPUTE_FRAMES);
adapter = new InterfaceUsingWovenProxyAdapter(cv, className, loader);
diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceProxyGenerator.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceProxyGenerator.java
index acd306d..f1bd2b6 100644
--- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceProxyGenerator.java
+++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceProxyGenerator.java
@@ -48,7 +48,7 @@
public InterfaceProxyGenerator()
{
- super(Opcodes.ASM8);
+ super(Opcodes.ASM9);
}
diff --git a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/SyntheticSerialVerUIDAdder.java b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/SyntheticSerialVerUIDAdder.java
index 79867c8..e1b61cd 100644
--- a/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/SyntheticSerialVerUIDAdder.java
+++ b/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/SyntheticSerialVerUIDAdder.java
@@ -25,7 +25,7 @@
import org.objectweb.asm.Type;
import org.objectweb.asm.commons.SerialVersionUIDAdder;
-import static org.objectweb.asm.Opcodes.ASM8;
+import static org.objectweb.asm.Opcodes.ASM9;
class SyntheticSerialVerUIDAdder extends SerialVersionUIDAdder {
@@ -43,7 +43,7 @@
private boolean hasSVUID;
public SyntheticSerialVerUIDAdder(WovenProxyAdapter cv) {
- super(ASM8, cv);
+ super(ASM9, cv);
wpa = cv;
}
