aboutsummaryrefslogtreecommitdiffstats
path: root/weaver
diff options
context:
space:
mode:
authorAlexander Kriegisch <Alexander@Kriegisch.name>2021-03-13 10:42:05 +0700
committerAlexander Kriegisch <Alexander@Kriegisch.name>2021-03-16 08:21:05 +0700
commit7fab8259c448aa3185bab27e7bc813bc3512b8a3 (patch)
treef3b24de90a7ef8580035d1c8794189687e457de1 /weaver
parent8348a8f6536971b8c1261923f5a5670c97bf1dcb (diff)
downloadaspectj-7fab8259c448aa3185bab27e7bc813bc3512b8a3.tar.gz
aspectj-7fab8259c448aa3185bab27e7bc813bc3512b8a3.zip
Upgrade to ASM 9.1, delete obsolete ASM binaries
Keep only ASM 2.0 binary because it is still used in UnweavableTest which uses an old ASM API, e.g. with a ClassWriter constructor which no longer exists. Also add JarJar 1.3 library because it is needed by an Ant task in lib/asm/build.xml. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'weaver')
-rw-r--r--weaver/pom.xml2
-rw-r--r--weaver/src/main/java/org/aspectj/weaver/bcel/asm/StackMapAdder.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/weaver/pom.xml b/weaver/pom.xml
index 4cc59bdfb..48703bf81 100644
--- a/weaver/pom.xml
+++ b/weaver/pom.xml
@@ -78,7 +78,7 @@
<artifactId>asm</artifactId>
<version>1.0</version>
<scope>system</scope>
- <systemPath>${project.basedir}/../lib/asm/asm-8.0.1.renamed.jar</systemPath>
+ <systemPath>${project.basedir}/../lib/asm/asm-9.1.renamed.jar</systemPath>
</dependency>
</dependencies>
</project>
diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/asm/StackMapAdder.java b/weaver/src/main/java/org/aspectj/weaver/bcel/asm/StackMapAdder.java
index 9be8f80de..1de90f888 100644
--- a/weaver/src/main/java/org/aspectj/weaver/bcel/asm/StackMapAdder.java
+++ b/weaver/src/main/java/org/aspectj/weaver/bcel/asm/StackMapAdder.java
@@ -56,7 +56,7 @@ public class StackMapAdder {
private static class AspectJClassVisitor extends ClassVisitor {
public AspectJClassVisitor(ClassVisitor classwriter) {
- super(Opcodes.ASM8, classwriter);
+ super(Opcodes.ASM9, classwriter);
}
@Override
@@ -69,7 +69,7 @@ public class StackMapAdder {
// created by a ClassWriter (see top level class comment)
static class AJMethodVisitor extends MethodVisitor {
public AJMethodVisitor(MethodVisitor mv) {
- super(Opcodes.ASM8,mv);
+ super(Opcodes.ASM9,mv);
}
}